Diagram improvements