Updated RoomHandler with comments