FMU-17 Booking domain model changes