diff --git a/103976/examples/CommsIDtoVIN.json b/103976/examples/CommsIDtoVIN.json
new file mode 100644
index 0000000000000000000000000000000000000000..14bc4199ba9990b400311f7cc0a3f3bd5e69d467
--- /dev/null
+++ b/103976/examples/CommsIDtoVIN.json
@@ -0,0 +1,5 @@
+{
+    "CommsIDtoVINRecords" : [
+        { "VIN" : "1G9Y817H34LSP7293" }
+    ]
+}
\ No newline at end of file
diff --git a/103976/examples/VINtoCommsID.json b/103976/examples/VINtoCommsID.json
new file mode 100644
index 0000000000000000000000000000000000000000..7b9ba0b1de407bad37d94218afcd630dc9d9adba
--- /dev/null
+++ b/103976/examples/VINtoCommsID.json
@@ -0,0 +1,67 @@
+{
+    "VINtoCommsIDRecords" : [
+        {
+            "CommsID" : { "IMEI" : "00440123456789" },
+            "AssociationTime" : {
+                "PeriodInTime" : {
+                    "StartTime" : "2022-01-16T15:57:00Z",
+                    "EndTime" : "2022-01-16T15:57:00Z"
+                }
+            }        
+        },
+        {
+            "CommsID" : { "IMSI" : "999990123456789" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "ICCID" : "89999012345678901234" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "PEIIMEI" : "00440123456789" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "SUPIIMSI" : "999990123456789" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "SUPINAI" : "example@example.com" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "MSISDN" : "00491713920000" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "GPSIMSISDN" : "00491713920000" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "MACAddress" : "00:00:5e:00:53:00" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        },
+        {
+            "CommsID" : { "EUI164" : "00:00:5e:ef:10:00:00:00" },
+            "AssociationTime" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }        
+        }
+    ]
+}
\ No newline at end of file
diff --git a/103976/examples/VINtoLocation.json b/103976/examples/VINtoLocation.json
new file mode 100644
index 0000000000000000000000000000000000000000..708d23bc7ce49f0af98118a860539a8b444907b7
--- /dev/null
+++ b/103976/examples/VINtoLocation.json
@@ -0,0 +1,28 @@
+{
+    "VINtoLocationRecords" : [
+        {
+            "Location" : {
+                "WGS84CoordinateDecimal" : {
+                    "etsi280:latitude" : "N43.617003",
+                    "etsi280:longitude" : "E007.053222"
+                }
+            },
+            "TimeOfLocation" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            }
+        },
+        {
+            "Location" : {
+                "WGS84CoordinateDecimal" : {
+                    "etsi280:latitude" : "N43.617003",
+                    "etsi280:longitude" : "E007.053222"
+                }
+            },
+            "TimeOfLocation" : {
+                "PointInTime" : "2022-01-16T15:57:00Z"
+            },
+            "SourceOfLocation" : "GNSS",
+            "LocationRecordReason" : "Location record reason"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/103976/examples/example.json b/103976/examples/example.json
deleted file mode 100644
index f8090eea8ea07cb0550b7313d2e2fb12b10813b4..0000000000000000000000000000000000000000
--- a/103976/examples/example.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "VINtoLocationRecords" : [
-        {
-            "Location" : {
-                "WGS84CoordinateDecimal" : {
-                    "etsi280:latitude" : "N54.123456",
-                    "etsi280:longitude" : "W001.123456"
-                }
-            },
-            "TimeOfLocation" : {
-                "PointInTime" : "2022-01-16T15:57:00Z"
-            },
-            "CommunicationsIdentifier" : {
-                "IMSI" : "0123456"
-            },
-            "AssociationTime" : {
-                "PeriodInTime" : {
-                    "StartTime" : "2022-01-16T15:57:00Z",
-                    "EndTime" : "2022-01-16T15:57:00Z"
-                }
-            }        
-        }
-    ]
-}
\ No newline at end of file
diff --git a/103976/ts_103976.schema.json b/103976/ts_103976.schema.json
index 008c0835d7eae7ced4eae246f59577794d01232a..60036a3dce22ae4b4a24daf4660d5c4980844d26 100644
--- a/103976/ts_103976.schema.json
+++ b/103976/ts_103976.schema.json
@@ -1,5 +1,6 @@
 {
     "$id": "ts_103976_core",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",    
     "$defs": { 
         "AssociationPeriod" : {
             "type" : "object",
@@ -41,47 +42,47 @@
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/ICCID"} },
+                    "properties" : { "ICCID" : { "$ref" : "ts_103280_2017_07#/$defs/ICCID"} },
                     "required" : ["ICCID"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/PEIIMEI"} },
+                    "properties" : { "PEIIMEI" : { "$ref" : "ts_103280_2017_07#/$defs/PEIIMEI"} },
                     "required" : ["PEIIMEI"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPIIMSI"} },
+                    "properties" : { "SUPIIMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPIIMSI"} },
                     "required" : ["SUPIIMSI"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPINAI"} },
+                    "properties" : { "SUPINAI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPINAI"} },
                     "required" : ["SUPINAI"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/InternationalE164"} },
+                    "properties" : { "MSISDN" : { "$ref" : "ts_103280_2017_07#/$defs/InternationalE164"} },
                     "required" : ["MSISDN"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSIMSISDN"} },
+                    "properties" : { "GPSIMSISDN" : { "$ref" : "ts_103280_2017_07#/$defs/GPSIMSISDN"} },
                     "required" : ["GPSIMSISDN"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSINAI"} },
+                    "properties" : { "GPSINAI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSINAI"} },
                     "required" : ["GPSINAI"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/MACAddress"} },
+                    "properties" : { "MACAddress" : { "$ref" : "ts_103280_2017_07#/$defs/MACAddress"} },
                     "required" : ["MACAddress"]                    
                 },
                 {
                     "type" : "object",
-                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/EUI64"} },
+                    "properties" : { "EUI164" : { "$ref" : "ts_103280_2017_07#/$defs/EUI64"} },
                     "required" : ["EUI164"]
                 }
             ]
@@ -92,7 +93,8 @@
                     "type"  : "object",
                     "properties" : {
                         "WGS84CoordinateDecimal" : { "$ref"  : "ts_103280_2017_07#/$defs/WGS84CoordinateDecimal"}
-                    }
+                    },
+                    "required" : ["WGS84CoordinateDecimal"]
                 }
             ]
         },
@@ -131,7 +133,7 @@
                     "type" : "array",
                     "items" : { "$ref" : "#/$defs/VINtoCommsIDRecord"}
                 },
-                "CommsIDToVINRecords" : {
+                "CommsIDtoVINRecords" : {
                     "type" : "array",
                     "items" : { "$ref" : "#/$defs/CommsIDToVINRecord"}
                 },