Fixing refactored mappings