Updated CTS, Compartment to RoomType etc.