More Diagram updates