Reflecting the latest changes in Chart-diagrams.