diff --git a/.gitmodules b/.gitmodules
index e03308e..cefc7b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "grammars/relaton-model-iso"]
 	path = grammars/relaton-model-iso
 	url = /~https://github.com/relaton/relaton-model-iso
+[submodule "grammars/relaton-model-iec"]
+	path = grammars/relaton-model-iec
+	url = /~https://github.com/relaton/relaton-model-iec
diff --git a/grammars/bsi.rnc b/grammars/bsi.rnc
index f79acdb..ecc5465 100644
--- a/grammars/bsi.rnc
+++ b/grammars/bsi.rnc
@@ -1,25 +1,10 @@
 #default namespace = "https://www.metanorma.com/ns/bsi"
 
+include "relaton-bsi.rnc" { }
 include "isostandard.rnc" {
 
 start = bsi-standard
 
-DocumentType =
-     "british-standard" | "draft-for-development" | "published-document" |
-     "privately-subscribed-standard" | "publicly-available-specification" |
-     "flex-standard" | "international-standard" | "technical-specification" |
-     "technical-report" | "guide" | "international-workshop-agreement" |
-     "industry-technical-agreement" | "standard" | "european-workshop-agreement" |
-     "fast-track-standard"
-
-DocumentSubtype = "specification" | "method-of-test" | "method-of-specifying" |
-                  "vocabulary" | "code-of-practice"
-
-BibDataExtensionType =
-  attribute schema-version { text }?,
-        doctype, docsubtype?, editorialgroup, ics*, structuredidentifier, 
-        stagename?, coverimages*
-
 admonition =
   element admonition {
     attribute type { AdmonitionType },
@@ -95,8 +80,6 @@ floating-section-title =
 
 AdmonitionType |= "commentary"
 
-coverimages = element coverimages { image+ }
-
 # We display the Normative References between scope and terms; but to keep the
 # grammar simple, we keep the references together
 bsi-standard = 
diff --git a/grammars/bsi.rng b/grammars/bsi.rng
index fd34845..7dfa31d 100644
--- a/grammars/bsi.rng
+++ b/grammars/bsi.rng
@@ -1,58 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace = "https://www.metanorma.com/ns/bsi" -->
+  <include href="relaton-bsi.rng"/>
   <include href="isostandard.rng">
     <start>
       <ref name="bsi-standard"/>
     </start>
-    <define name="DocumentType">
-      <choice>
-        <value>british-standard</value>
-        <value>draft-for-development</value>
-        <value>published-document</value>
-        <value>privately-subscribed-standard</value>
-        <value>publicly-available-specification</value>
-        <value>flex-standard</value>
-        <value>international-standard</value>
-        <value>technical-specification</value>
-        <value>technical-report</value>
-        <value>guide</value>
-        <value>international-workshop-agreement</value>
-        <value>industry-technical-agreement</value>
-        <value>standard</value>
-        <value>european-workshop-agreement</value>
-        <value>fast-track-standard</value>
-      </choice>
-    </define>
-    <define name="DocumentSubtype">
-      <choice>
-        <value>specification</value>
-        <value>method-of-test</value>
-        <value>method-of-specifying</value>
-        <value>vocabulary</value>
-        <value>code-of-practice</value>
-      </choice>
-    </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="coverimages"/>
-      </zeroOrMore>
-    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -300,13 +253,6 @@
   <define name="AdmonitionType" combine="choice">
     <value>commentary</value>
   </define>
-  <define name="coverimages">
-    <element name="coverimages">
-      <oneOrMore>
-        <ref name="image"/>
-      </oneOrMore>
-    </element>
-  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
diff --git a/grammars/copy.sh b/grammars/copy.sh
index eab6027..fe3e0c6 100644
--- a/grammars/copy.sh
+++ b/grammars/copy.sh
@@ -4,12 +4,15 @@ cp basicdoc.rng reqt.rng biblio.rng biblio-standoc.rng ../../metanorma-standoc/l
 cat isodoc.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/standoc" }) '> ../../metanorma-standoc/lib/metanorma/standoc/isodoc.rng
 cp basicdoc.rng reqt.rng biblio.rng biblio-standoc.rng isodoc.rng ../../metanorma-iso/lib/metanorma/iso
 cp relaton-iso.rng ../../metanorma-iso/lib/metanorma/iso
-cat isostandard.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/iso" }) '>  ../../metanorma-iso/lib/metanorma/iso/isostandard.rng
+cp isostandard.rng ../../metanorma-iso/lib/metanorma/iso
+cat isostandard-compile.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/iso" }) '>  ../../metanorma-iso/lib/metanorma/iso/isostandard-compile.rng
 cat isostandard-amd.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/iso" }) '>  ../../metanorma-iso/lib/metanorma/iso/isostandard-amd.rng
 cp basicdoc.rng reqt.rng biblio.rng biblio-standoc.rng isodoc.rng ../../metanorma-iec/lib/metanorma/iec
+cp relaton-iec.rng ../../metanorma-iec/lib/metanorma/iec
 cp isostandard.rng ../../metanorma-iec/lib/metanorma/iec/isostandard.rng
 cat iec.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/iec" }) '>  ../../metanorma-iec/lib/metanorma/iec/iec.rng
 cp basicdoc.rng reqt.rng biblio.rng biblio-standoc.rng isodoc.rng ../../metanorma-bsi/lib/metanorma/bsi
+cp relaton-bsi.rng ../../metanorma-bsi/lib/metanorma/bsi
 cp isostandard.rng ../../metanorma-bsi/lib/metanorma/bsi/isostandard.rng
 cat bsi.rng | ruby -pe '$_.gsub!(/<grammar /, %{<grammar ns="https://www.metanorma.org/ns/bsi" }) '>  ../../metanorma-bsi/lib/metanorma/bsi/bsi.rng
 cp basicdoc.rng reqt.rng biblio.rng biblio-standoc.rng isodoc.rng ../../metanorma-csd/lib/metanorma/cc
diff --git a/grammars/iec.rnc b/grammars/iec.rnc
index 9927507..e15fadf 100644
--- a/grammars/iec.rnc
+++ b/grammars/iec.rnc
@@ -1,21 +1,10 @@
 #default namespace = "https://www.metanorma.com/ns/iec"
 
+include "relaton-iec.rnc" { }
 include "isostandard.rnc" {
 
 start = iec-standard
 
-DocumentType =
-     "international-standard" | "technical-specification" |
-     "technical-report" | "publicly-available-specification" |
-    "international-workshop-agreement" | "guide" | "industry-technical-agreement" |
-    "system-reference-delivrabble"
-
-BibDataExtensionType =
-  attribute schema-version { text }?,
-        doctype, docsubtype?, horizontal?, function?, editorialgroup, ics*, structuredidentifier, 
-        stagename?, updates_document_type?, accessibility-color-inside?, price-code?,
-        cen-processing?, secretary?, interest-to-committees?, tc-sc-officers-note?
-
 term = 
   element term { 
     attribute id { xsd:ID }?,
@@ -31,14 +20,6 @@ term =
 
 # end overrides
 
-function = element function { "emc" | "safety" | "environment" | "quality-assurance" }
-accessibility-color-inside = element accessibility-color-inside { xsd:boolean }
-price-code = element price-code { text }
-cen-processing = element cen-processing { xsd:boolean }
-secretary = element secretary { text }
-interest-to-committees = element interest-to-committees { text }
-tc-sc-officers-note = element tc-sc-officers-note { BasicBlock* }
-
 # We display the Normative References between scope and terms; but to keep the
 # grammar simple, we keep the references together
 iec-standard = 
@@ -48,4 +29,3 @@ attribute version { text },
     bibdata, termdocsource*, misccontainer?, boilerplate?, preface, sections+, annex*, bibliography, indexsect*
   }
 
-updates_document_type = element updates-document-type { DocumentType }
diff --git a/grammars/iec.rng b/grammars/iec.rng
index 0bd8844..1902320 100644
--- a/grammars/iec.rng
+++ b/grammars/iec.rng
@@ -1,66 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace = "https://www.metanorma.com/ns/iec" -->
+  <include href="relaton-iec.rng"/>
   <include href="isostandard.rng">
     <start>
       <ref name="iec-standard"/>
     </start>
-    <define name="DocumentType">
-      <choice>
-        <value>international-standard</value>
-        <value>technical-specification</value>
-        <value>technical-report</value>
-        <value>publicly-available-specification</value>
-        <value>international-workshop-agreement</value>
-        <value>guide</value>
-        <value>industry-technical-agreement</value>
-        <value>system-reference-delivrabble</value>
-      </choice>
-    </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <optional>
-        <ref name="horizontal"/>
-      </optional>
-      <optional>
-        <ref name="function"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-      <optional>
-        <ref name="updates_document_type"/>
-      </optional>
-      <optional>
-        <ref name="accessibility-color-inside"/>
-      </optional>
-      <optional>
-        <ref name="price-code"/>
-      </optional>
-      <optional>
-        <ref name="cen-processing"/>
-      </optional>
-      <optional>
-        <ref name="secretary"/>
-      </optional>
-      <optional>
-        <ref name="interest-to-committees"/>
-      </optional>
-      <optional>
-        <ref name="tc-sc-officers-note"/>
-      </optional>
-    </define>
     <define name="term">
       <element name="term">
         <optional>
@@ -111,48 +56,6 @@
     </define>
   </include>
   <!-- end overrides -->
-  <define name="function">
-    <element name="function">
-      <choice>
-        <value>emc</value>
-        <value>safety</value>
-        <value>environment</value>
-        <value>quality-assurance</value>
-      </choice>
-    </element>
-  </define>
-  <define name="accessibility-color-inside">
-    <element name="accessibility-color-inside">
-      <data type="boolean"/>
-    </element>
-  </define>
-  <define name="price-code">
-    <element name="price-code">
-      <text/>
-    </element>
-  </define>
-  <define name="cen-processing">
-    <element name="cen-processing">
-      <data type="boolean"/>
-    </element>
-  </define>
-  <define name="secretary">
-    <element name="secretary">
-      <text/>
-    </element>
-  </define>
-  <define name="interest-to-committees">
-    <element name="interest-to-committees">
-      <text/>
-    </element>
-  </define>
-  <define name="tc-sc-officers-note">
-    <element name="tc-sc-officers-note">
-      <zeroOrMore>
-        <ref name="BasicBlock"/>
-      </zeroOrMore>
-    </element>
-  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -189,9 +92,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="updates_document_type">
-    <element name="updates-document-type">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
 </grammar>
diff --git a/grammars/isostandard-amd.rnc b/grammars/isostandard-amd.rnc
index 3e27775..a7e1ae2 100644
--- a/grammars/isostandard-amd.rnc
+++ b/grammars/isostandard-amd.rnc
@@ -1,5 +1,6 @@
 #default namespace isostandard = "https://www.metanorma.com/ns/iso"
 
+include "relaton-iso.rnc" { }
 include "isostandard.rnc" {
 
 start = iso-standard
diff --git a/grammars/isostandard-amd.rng b/grammars/isostandard-amd.rng
index 61cafd8..374b2ea 100644
--- a/grammars/isostandard-amd.rng
+++ b/grammars/isostandard-amd.rng
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <include href="relaton-iso.rng"/>
   <include href="isostandard.rng">
     <start>
       <ref name="iso-standard"/>
diff --git a/grammars/isostandard-compile.rnc b/grammars/isostandard-compile.rnc
new file mode 100644
index 0000000..d8ca91a
--- /dev/null
+++ b/grammars/isostandard-compile.rnc
@@ -0,0 +1,10 @@
+#default namespace isostandard = "https://www.metanorma.com/ns/iso"
+
+include "relaton-iso.rnc" { }
+include "isostandard.rnc" {
+
+}
+
+# end overrides
+
+
diff --git a/grammars/isostandard-compile.rng b/grammars/isostandard-compile.rng
new file mode 100644
index 0000000..817612d
--- /dev/null
+++ b/grammars/isostandard-compile.rng
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <include href="relaton-iso.rng"/>
+  <include href="isostandard.rng"/>
+</grammar>
+<!-- end overrides -->
diff --git a/grammars/isostandard.rnc b/grammars/isostandard.rnc
index 11dc528..0c8ed1c 100644
--- a/grammars/isostandard.rnc
+++ b/grammars/isostandard.rnc
@@ -1,6 +1,5 @@
 #default namespace isostandard = "https://www.metanorma.com/ns/iso"
 
-include "relaton-iso.rnc" { }
 include "isodoc.rnc" { 
 
 start = iso-standard
diff --git a/grammars/isostandard.rng b/grammars/isostandard.rng
index 0ac68a8..6de0ffd 100644
--- a/grammars/isostandard.rng
+++ b/grammars/isostandard.rng
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
-  <include href="relaton-iso.rng"/>
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
diff --git a/grammars/make.sh b/grammars/make.sh
index 15c3459..84fde8a 100644
--- a/grammars/make.sh
+++ b/grammars/make.sh
@@ -20,16 +20,13 @@ git checkout main && git pull
 cd ../..
 cp metanorma-requirements-models/grammars/reqt.rnc .
 
-cd relaton-model-ieee/grammars
+for i in ieee iso iec bsi
+do
+cd relaton-model-$i/grammars
 git checkout main && git pull
 cd ../..
-cp relaton-model-ieee/grammars/relaton-ieee.rnc .
-
-cd relaton-model-iso/grammars
-git checkout main && git pull
-cd ../..
-cp relaton-model-iso/grammars/relaton-iso.rnc .
-
+cp relaton-model-$i/grammars/relaton-$i.rnc .
+done
 
 gem list | grep rsec
 if [[ $? -ne 0 ]]; then
@@ -44,30 +41,9 @@ fi
 
 echo "Compiling..."
 
-java -jar jing-trang/build/trang.jar -I rnc -O rng biblio.rnc biblio.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng biblio-standoc.rnc biblio-standoc.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng basicdoc.rnc basicdoc.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng reqt.rnc reqt.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng relaton-ieee.rnc relaton-ieee.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng relaton-iso.rnc relaton-iso.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng isodoc.rnc isodoc.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng isostandard.rnc isostandard.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng isostandard-amd.rnc isostandard-amd.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng iec.rnc iec.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng csd.rnc csd.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng csa.rnc csa.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng gbstandard.rnc gbstandard.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng m3d.rnc m3d.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng rsd.rnc rsd.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng ieee.rnc ieee.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng un.rnc un.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng ogc.rnc ogc.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng nist.rnc nist.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng itu.rnc itu.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng ietf.rnc ietf.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng iho.rnc iho.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng bipm.rnc bipm.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng bsi.rnc bsi.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng 3gpp.rnc 3gpp.rng
-java -jar jing-trang/build/trang.jar -I rnc -O rng w3c.rnc w3c.rng
+for i in biblio biblio-standoc basicdoc reqt relaton-ieee relaton-iso relaton-iec relaton-bsi isodoc isostandard isostandard-compile isostandard-amd iec csd csa gbstandard m3d rsd ieee un ogc nist itu ietf iho bipm bsi 3gpp w3c
+do
+java -jar jing-trang/build/trang.jar -I rnc -O rng $i.rnc $i.rng
+done
+
 sh copy.sh