Is it possible to get rid of the outer Map? As far as I can see it will break all of the current index queries. (Though I haven't tried in an actual project)