ADD - continued Booking refactoring