Diagram Enhancements