Added support for custom game container