We should introduce the ontological model we discussed several weeks ago instead. 

Of course, not as part of this PR.