Add support for Shaape diagrams