Updates for diagrams 0.6