Job factory types refactored