Join game router refactor