Mappings refactoring