MapBlocking refactoring mid-commit