Additional refactoring for newcustomerall jobs