[OLINGO-472] Batch Refactoring