Validation and other refinements in Reservation