Continued changes to base Game Framework