Refactored Map Service