Fix 140 - Locations - Integrate the Map API