Async refactoring. Problems with V4 batch.