Refactored; Simplify EngineBase.