Make it more obvious where data comes from.
Closes #343