cmdGenerator and jobFactory update