Added RoomType and ServiceType classes