Enhancement/379/cmapi basemap change