Updated Game infrastructure

Updated Game infrastructure