More work on the booking service