Refactored Map VC