CRUD booking refactoring