Rework rendering model for diagram version E