added support for new types of rooms