Refactored mapping