refactored mappings