Refactoring, createad NoBatching, BatchKey