Diagram updates to follow specs