More diagram updates