added room and roomtype