diff --git a/.github/workflows/GroovyScriptTest.yml b/.github/workflows/GroovyScriptTest.yml
index 2342e95..7dd040d 100644
--- a/.github/workflows/GroovyScriptTest.yml
+++ b/.github/workflows/GroovyScriptTest.yml
@@ -24,3 +24,5 @@ jobs:
         run: |
           groovy validate.groovy InteractionData http://vocabularies.wikipathways.org/wp#InteractionData
           groovy validate.groovy Enzyme http://vocabularies.wikipathways.org/wp#Protein
+          # groovy validate.groovy Substrate http://vocabularies.wikipathways.org/wp#???
+          # groovy validate.groovy Measurement http://vocabularies.wikipathways.org/wp#???
diff --git a/shapes/Measurement.shex b/shapes/Measurement.shex
new file mode 100644
index 0000000..98ba748
--- /dev/null
+++ b/shapes/Measurement.shex
@@ -0,0 +1,33 @@
+BASE <http://bigcat-um.github.io/KinRDF/shapes#>
+PREFIX : <http://bigcat-um.github.io/KinRDF/shapes#>
+
+PREFIX dc:    <http://purl.org/dc/elements/1.1/>
+PREFIX dct:   <http://purl.org/dc/terms/>
+PREFIX foaf:  <http://xmlns.com/foaf/0.1/>
+PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sbd:   <https://www.sbd4nano.eu/rdf/#>
+PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
+PREFIX wp:    <http://vocabularies.wikipathways.org/wp#>
+PREFIX sio:   <http://semanticscience.org/resource/>
+PREFIX chebi: <http://purl.obolibrary.org/obo/>
+
+:Measurement {
+  dct:references IRI + ;
+  dc:source Literal ;
+  wp:organismName [@en] ;
+  SER:hasKm @:MeasurementValue * ;
+  SER:hasPh @:MeasurementValue * ;
+  wdt:P2076 @:MeasurementValue * ;
+  SER:hasKcat @:MeasurementValue * ;
+  SER:hasKcatKm @:MeasurementValue * ;
+  dc:source Literal ;
+  dct:references @:Publication
+]
+
+:MeasurementValue [
+  sio:has-unit Literal ;
+  sio:has-value Literal
+]
+
+:Publication [
+]
diff --git a/shapes/Substrate.shex b/shapes/Substrate.shex
new file mode 100644
index 0000000..b2c699c
--- /dev/null
+++ b/shapes/Substrate.shex
@@ -0,0 +1,16 @@
+BASE <http://bigcat-um.github.io/KinRDF/shapes#>
+PREFIX : <http://bigcat-um.github.io/KinRDF/shapes#>
+
+PREFIX dc:    <http://purl.org/dc/elements/1.1/>
+PREFIX dct:   <http://purl.org/dc/terms/>
+PREFIX foaf:  <http://xmlns.com/foaf/0.1/>
+PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sbd:   <https://www.sbd4nano.eu/rdf/#>
+PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
+PREFIX wp:    <http://vocabularies.wikipathways.org/wp#>
+PREFIX sio:   <http://semanticscience.org/resource/>
+PREFIX chebi: <http://purl.obolibrary.org/obo/>
+
+:Substrate {
+  a [ chebi:CHEBI_23367 ]
+}