Batch Entity Creator refactored