Refactored the way reservations are saved