added rooms support