mappings refactoring