REFACTORING batch architecture new version