Initial work to support MapKit