MapBlocking refactoring