Complete integration of Mapping functionality + a few changes in APIs and Capabilities/Functionalites