Refactored GameStub