further refactoring
further refactoring of EntityMapping operator