Reservation refactoring