Refactored Map