Added Rooms support