reorganization of map data source interfaces