diff --git a/lib/metanorma/cc/isodoc.rng b/lib/metanorma/cc/isodoc.rng
index c69bf163..11ee61f8 100644
--- a/lib/metanorma/cc/isodoc.rng
+++ b/lib/metanorma/cc/isodoc.rng
@@ -220,24 +220,7 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -254,24 +237,7 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <attribute name="type">
             <choice>
@@ -299,29 +265,12 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <attribute name="key">
             <data type="boolean"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -362,24 +311,7 @@
         <optional>
           <attribute name="number"/>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -427,27 +359,10 @@
             <data type="anyURI"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="width"/>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="colgroup"/>
         </optional>
@@ -485,27 +400,10 @@
         <optional>
           <attribute name="subsequence"/>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="class"/>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="source"/>
         </optional>
@@ -551,27 +449,10 @@
         <optional>
           <attribute name="subsequence"/>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="lang"/>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <attribute name="linenums">
             <data type="boolean"/>
@@ -610,29 +491,12 @@
         <optional>
           <attribute name="subsequence"/>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="inequality">
             <data type="boolean"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <ref name="stem"/>
         <optional>
           <ref name="dl"/>
@@ -651,27 +515,7 @@
           <ref name="Alignments"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="keep-with-next">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="keep-lines-together">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="type"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <zeroOrMore>
         <ref name="TextElement"/>
       </zeroOrMore>
@@ -689,27 +533,10 @@
             <ref name="Alignments"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
         <optional>
           <attribute name="type"/>
         </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <zeroOrMore>
           <choice>
             <ref name="TextElement"/>
@@ -731,24 +558,7 @@
             <ref name="Alignments"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
+        <ref name="BlockAttributes"/>
         <optional>
           <ref name="quote-source"/>
         </optional>
@@ -828,27 +638,9 @@
         <optional>
           <attribute name="subsequence"/>
         </optional>
-        <optional>
-          <attribute name="keep-with-next">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="keep-lines-together">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="type"/>
         </optional>
-        <optional>
-          <attribute name="tag"/>
-        </optional>
-        <optional>
-          <attribute name="multilingual-rendering">
-            <ref name="MultilingualRenderingType"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="coverpage">
             <data type="boolean"/>
@@ -859,6 +651,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <ref name="BlockAttributes"/>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1332,14 +1125,7 @@
       <optional>
         <attribute name="class"/>
       </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1908,7 +1694,10 @@
       </zeroOrMore>
       <choice>
         <oneOrMore>
-          <ref name="term"/>
+          <choice>
+            <ref name="term"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
         <group>
           <zeroOrMore>
@@ -1934,14 +1723,7 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -2282,24 +2064,7 @@
       <optional>
         <attribute name="subsequence"/>
       </optional>
-      <optional>
-        <attribute name="keep-with-next">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="keep-lines-together">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
@@ -2316,24 +2081,7 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <optional>
-        <attribute name="keep-with-next">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="keep-lines-together">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -2460,14 +2208,7 @@
       <optional>
         <attribute name="title"/>
       </optional>
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <optional>
         <element name="location">
           <zeroOrMore>
@@ -2527,14 +2268,7 @@
   </define>
   <define name="imagemap">
     <element name="imagemap">
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <ref name="figure"/>
       <zeroOrMore>
         <element name="area">
@@ -2580,14 +2314,7 @@
   </define>
   <define name="svgmap">
     <element name="svgmap">
-      <optional>
-        <attribute name="tag"/>
-      </optional>
-      <optional>
-        <attribute name="multilingual-rendering">
-          <ref name="MultilingualRenderingType"/>
-        </attribute>
-      </optional>
+      <ref name="BlockAttributes"/>
       <ref name="figure"/>
       <zeroOrMore>
         <element name="target">
@@ -2694,6 +2421,29 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BlockAttributes">
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="columns"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>
diff --git a/lib/metanorma/cc/version.rb b/lib/metanorma/cc/version.rb
index a9f2f123..5aa21613 100644
--- a/lib/metanorma/cc/version.rb
+++ b/lib/metanorma/cc/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.2.4".freeze
+    VERSION = "2.2.5".freeze
   end
 end
diff --git a/metanorma-cc.gemspec b/metanorma-cc.gemspec
index f3394e5a..f346ef63 100644
--- a/metanorma-cc.gemspec
+++ b/metanorma-cc.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.3.0"
+  spec.add_dependency "metanorma-generic", "~> 2.4.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
diff --git a/spec/metanorma/processor_spec.rb b/spec/metanorma/processor_spec.rb
index 31bdc700..9fb0608b 100644
--- a/spec/metanorma/processor_spec.rb
+++ b/spec/metanorma/processor_spec.rb
@@ -47,13 +47,14 @@
         </sections>
       </csd-standard>
     INPUT
-    expect(xmlpp(File.read("test.html", encoding: "utf-8")
+    expect(xmlpp(strip_guid(File.read("test.html", encoding: "utf-8")
       .gsub(%r{^.*<main}m, "<main")
-      .gsub(%r{</main>.*}m, "</main>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      .gsub(%r{</main>.*}m, "</main>"))))
+      .to be_equivalent_to xmlpp(strip_guid(<<~"OUTPUT"))
         <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
           <p class="zzSTDTitle1"></p>
           <div id="H">
-            <h1 id="toc0">1.&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</h1>
+            <h1 id="_">1.&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</h1>
             <p class='Terms' style='text-align:left;' id='J'><strong>1.1.</strong>&#xa0;Term2</p>
           </div>
         </main>