Updates to allow Chart-diagrams to build with latest diagrams release