added entities, with diagramming