Refactorings in MultiMapOperationFactory