added support for rooms