Removed EngineFactory class, added static method to Engine class.