Updated GameRoom and Factory