Upgrade data store mechanism
Remove map navigator from map structure