Refactoring, introduced BatchKey interface