Refactoring and adding HotelAvail