Include more useful info in the `data` object

Fixes #5.