BookingDAO refactoring