Refactoring NoBatching to NonBatching