Updated RoomHandler