Updated Game implementation