DataPreparationJob adapters refactoring