WIP of refactor to CommonOperationFactory (legacy in EditSession)