Diagram plugin and build script updated