Refactor EngineSettings