JobClient refactoring