Refactored data mapping