re-added Rooms, lost them in the previous commit