batch hub refactoring