diff --git a/build.sbt b/build.sbt
index 6f3afcc5..7029110c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,12 +27,10 @@ scalafmt: {
 val commonsVersion = "0.7.6"
 val provVersion    = "1.1.1"
 val kgVersion      = "0.9.4"
-val jenaVersion    = "3.8.0"
 
 lazy val prov           = "ch.epfl.bluebrain.nexus" %% "nexus-prov"      % provVersion
 lazy val commonsSchemas = "ch.epfl.bluebrain.nexus" %% "commons-schemas" % commonsVersion
 lazy val kgSchemas      = "ch.epfl.bluebrain.nexus" %% "kg-schemas"      % kgVersion
-lazy val jena           = "org.apache.jena"         % "jena-arq"         % jenaVersion
 
 lazy val core = project
   .in(file("modules/core"))
@@ -55,7 +53,7 @@ lazy val nexusschema = project
     name                := "kg-nsg-schemas",
     moduleName          := "kg-nsg-schemas",
     resolvers           += Resolver.bintrayRepo("bogdanromanx", "maven"),
-    libraryDependencies ++= Seq(commonsSchemas, kgSchemas, jena)
+    libraryDependencies ++= Seq(commonsSchemas, kgSchemas)
   )
 
 lazy val experiment = project
diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json
index a0999c01..e07cbfb7 100644
--- a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json
+++ b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json
@@ -65,14 +65,14 @@
           "path": "schema:dateCreated",
           "name": "Creation date",
           "description": "Date at which this entity created.",
-          "nodeKind": "xsd:dateTime",
+          "datatype": "xsd:dateTime",
           "maxCount": 1
         },
         {
           "path": "prov:wasRevisionOf",
           "name": "Revision of",
           "description": "The entity for which this entity is a revision of.",
-          "nodeKind": "xsd:dateTime",
+          "datatype": "xsd:dateTime",
           "maxCount": 1
         },
         {
diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json
index 44b1327b..e90714c1 100644
--- a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json
+++ b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json
@@ -63,7 +63,7 @@
           "path": "schema:dateCreated",
           "name": "Creation date",
           "description": "Date at which this entity created.",
-          "nodeKind": "xsd:dateTime",
+          "datatype": "xsd:dateTime",
           "maxCount": 1
         },
         {
diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.1.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.1.0.json
index 2eb5630f..bc4c1459 100644
--- a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.1.0.json
+++ b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.1.0.json
@@ -30,27 +30,27 @@
           "node": "{{base}}/schemas/nexus/schemaorg/propertyvalue/v0.1.0/shapes/PropertyValueShape"
         },
         {
-          "property": [
+          "or": [
             {
-              "or": [
-                {
-                  "path": "schema:propertyID",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "http//orcid.org",
-                  "maxCount": 1
-                },
-                {
-                  "path": "schema:name",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "orcid",
-                  "maxCount": 1
-                }
-              ]
+              "path": "schema:propertyID",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "http//orcid.org",
+              "maxCount": 1
             },
+            {
+              "path": "schema:name",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "orcid",
+              "maxCount": 1
+            }
+          ]
+        },
+        {
+          "property": [
             {
               "path": "schema:value",
               "name": "Orcid",
@@ -75,27 +75,27 @@
           "node": "{{base}}/schemas/nexus/schemaorgsh/propertyvalue/v0.1.0/shapes/PropertyValueShape"
         },
         {
-          "property": [
+          "or": [
             {
-              "or": [
-                {
-                  "path": "schema:propertyID",
-                  "name": "GRID ID property",
-                  "description": "The GRID property identifier.",
-                  "datatype": "xsd:string",
-                  "hasValue": "http//orcid.org",
-                  "maxCount": 1
-                },
-                {
-                  "path": "schema:name",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "grid",
-                  "maxCount": 1
-                }
-              ]
+              "path": "schema:propertyID",
+              "name": "GRID ID property",
+              "description": "The GRID property identifier.",
+              "datatype": "xsd:string",
+              "hasValue": "http//orcid.org",
+              "maxCount": 1
             },
+            {
+              "path": "schema:name",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "grid",
+              "maxCount": 1
+            }
+          ]
+        },
+        {
+          "property": [
             {
               "path": "schema:value",
               "name": "GRID ID",
diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.2.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.2.0.json
index 2e9e75a0..f2bf3eda 100644
--- a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.2.0.json
+++ b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.2.0.json
@@ -38,27 +38,27 @@
           "node": "{{base}}/schemas/nexus/schemaorg/propertyvalue/v0.1.0/shapes/PropertyValueShape"
         },
         {
-          "property": [
+          "or": [
             {
-              "or": [
-                {
-                  "path": "schema:propertyID",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "http//orcid.org",
-                  "maxCount": 1
-                },
-                {
-                  "path": "schema:name",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "orcid",
-                  "maxCount": 1
-                }
-              ]
+              "path": "schema:propertyID",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "http//orcid.org",
+              "maxCount": 1
             },
+            {
+              "path": "schema:name",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "orcid",
+              "maxCount": 1
+            }
+          ]
+        },
+        {
+          "property": [
             {
               "path": "schema:value",
               "name": "Orcid",
@@ -83,27 +83,27 @@
           "node": "{{base}}/schemas/nexus/schemaorgsh/propertyvalue/v0.1.0/shapes/PropertyValueShape"
         },
         {
-          "property": [
+          "or": [
             {
-              "or": [
-                {
-                  "path": "schema:propertyID",
-                  "name": "GRID ID property",
-                  "description": "The GRID property identifier.",
-                  "datatype": "xsd:string",
-                  "hasValue": "http//orcid.org",
-                  "maxCount": 1
-                },
-                {
-                  "path": "schema:name",
-                  "name": "Orcid ID",
-                  "description": "The property name.",
-                  "datatype": "xsd:string",
-                  "hasValue": "grid",
-                  "maxCount": 1
-                }
-              ]
+              "path": "schema:propertyID",
+              "name": "GRID ID property",
+              "description": "The GRID property identifier.",
+              "datatype": "xsd:string",
+              "hasValue": "http//orcid.org",
+              "maxCount": 1
             },
+            {
+              "path": "schema:name",
+              "name": "Orcid ID",
+              "description": "The property name.",
+              "datatype": "xsd:string",
+              "hasValue": "grid",
+              "maxCount": 1
+            }
+          ]
+        },
+        {
+          "property": [
             {
               "path": "schema:value",
               "name": "GRID ID",
diff --git a/modules/nexus-schemas/src/main/resources/contexts/nexus/core/schemaorg/v3.3.0.json b/modules/nexus-schemas/src/main/resources/contexts/nexus/core/schemaorg/v3.3.0.json
index 14f527aa..8947f3ae 100644
--- a/modules/nexus-schemas/src/main/resources/contexts/nexus/core/schemaorg/v3.3.0.json
+++ b/modules/nexus-schemas/src/main/resources/contexts/nexus/core/schemaorg/v3.3.0.json
@@ -51,9 +51,6 @@
       "@type": "@id",
       "@id": "schema:affiliation"
     },
-    "size": {
-      "@type": "@id",
-      "@id": "schema:size"
-    }
+    "size": "schema:size"
   }
 }
\ No newline at end of file