Identities mapping refactoring