Tackle pull request #4: Allow alternative mappings