Patch Set 2: I would prefer that you didn't submit this

(1 inline comment)

I think this that this is a good solution for now. We'll see how the adopters will try to use this and what kind of data they will need here.