Updated the room collection stuff