Expand data model to allow post-entities relations, for #73