Refactored bookings builder
;