AttributesMapper refactoring