change the bundle to include more relationship and char, location.