Right-o. @stefanv, can you point me to an example? I'll update the PR accordingly, but I want to make sure I'm doing it right.