Reservation added, refactoring continued