Diagram plugin updated and implementation migrated