I think this is ok, yeah, the filtering should be done by using Refs, which is fine in this case I think. To my understanding, the ValueMap works with the product key of the Refs, and it should be similar to what we've already implemented - even simpler! I had had a lot of hard time getting the dictionaries of the AssociationMap right...