Refactor EngineResponse / UpdaterManager