Booking module refactored
Booking module refactored