Making progress on Maps. Change ScopedMap to interface