Refactored BookingRepository