Partially refactored Itinerary and ItineraryList