Changes to RoomManager