Added support for rooms