Still needs the vendor name in EngineHandler