@jviereck We discussed this briefly before, but I think it would make more sense if the `raw` property contained the whole thing. What do you think? 

Note that this is a separate issue that should not be fixed in this PR.