A first solution for the entity assertions. Issue #11