Added support for diagrams 0.7