diff --git a/.github/workflows/GroovyScriptTest.yml b/.github/workflows/GroovyScriptTest.yml
index 57faf18..ca617c0 100644
--- a/.github/workflows/GroovyScriptTest.yml
+++ b/.github/workflows/GroovyScriptTest.yml
@@ -24,5 +24,6 @@ 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#???
+          groovy validate.groovy Interaction http://vocabularies.wikipathways.org/wp#Interaction
+          # groovy validate.groovy Substrate http://vocabularies.wikipathways.org/wp#Metabolite
+          #groovy validate.groovy Measurement http://vocabularies.wikipathways.org/wp#???
diff --git a/shapes/Interaction.shex b/shapes/Interaction.shex
new file mode 100644
index 0000000..39198d6
--- /dev/null
+++ b/shapes/Interaction.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 RHEA:   <https://identifiers.org/rhea/>  
+
+:Interaction {
+  a [ wp:Interaction ]
+}
diff --git a/shapes/Substrate.shex b/shapes/Substrate.shex
index b2c699c..fd3bd28 100644
--- a/shapes/Substrate.shex
+++ b/shapes/Substrate.shex
@@ -13,4 +13,5 @@ PREFIX chebi: <http://purl.obolibrary.org/obo/>
 
 :Substrate {
   a [ chebi:CHEBI_23367 ]
+  a [ wp:Metabolite ]
 }