diff --git a/schemas/approachsettlement-v1.0.json b/schemas/approachsettlement-v1.0.json
index 424d4c3..1af5052 100644
--- a/schemas/approachsettlement-v1.0.json
+++ b/schemas/approachsettlement-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/codexentry-v1.0.json b/schemas/codexentry-v1.0.json
index a2c4364..537240f 100644
--- a/schemas/codexentry-v1.0.json
+++ b/schemas/codexentry-v1.0.json
@@ -19,12 +19,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/commodity-v3.0.json b/schemas/commodity-v3.0.json
index 8c004ff..4609ace 100644
--- a/schemas/commodity-v3.0.json
+++ b/schemas/commodity-v3.0.json
@@ -18,13 +18,11 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "From Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->gameversion, else LoadGame->gameversion, else 'CAPI-market', else ''."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->build, else LoadGame->build, else 'CAPI-market', else ''."
                 },
                 "softwareName": {
                     "type"          : "string"
diff --git a/schemas/fcmaterials_capi-v1.0.json b/schemas/fcmaterials_capi-v1.0.json
index 49edb06..0b3f2be 100644
--- a/schemas/fcmaterials_capi-v1.0.json
+++ b/schemas/fcmaterials_capi-v1.0.json
@@ -16,6 +16,14 @@
                 "uploaderID": {
                     "type"          : "string"
                 },
+                "gameversion": {
+                    "type"          : "string",
+                    "description"   : "Value of 'CAPI-market' if possible, else empty string."
+                },
+                "gamebuild": {
+                    "type"          : "string",
+                    "description"   : "Value of 'CAPI-market' if possible, else empty string."
+                },
                 "softwareName": {
                     "type"          : "string"
                 },
diff --git a/schemas/fcmaterials_journal-v1.0.json b/schemas/fcmaterials_journal-v1.0.json
index 62c5d9b..26e4b88 100644
--- a/schemas/fcmaterials_journal-v1.0.json
+++ b/schemas/fcmaterials_journal-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/fssallbodiesfound-v1.0.json b/schemas/fssallbodiesfound-v1.0.json
index 18507d4..ec148a1 100644
--- a/schemas/fssallbodiesfound-v1.0.json
+++ b/schemas/fssallbodiesfound-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/fssbodysignals-v1.0.json b/schemas/fssbodysignals-v1.0.json
index 89bab05..26a3551 100644
--- a/schemas/fssbodysignals-v1.0.json
+++ b/schemas/fssbodysignals-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/fssdiscoveryscan-v1.0.json b/schemas/fssdiscoveryscan-v1.0.json
index f007fe0..618bd48 100644
--- a/schemas/fssdiscoveryscan-v1.0.json
+++ b/schemas/fssdiscoveryscan-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/fsssignaldiscovered-v1.0.json b/schemas/fsssignaldiscovered-v1.0.json
index 0e30eaf..3f7b171 100644
--- a/schemas/fsssignaldiscovered-v1.0.json
+++ b/schemas/fsssignaldiscovered-v1.0.json
@@ -19,12 +19,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json
index d01fafa..eb7737b 100644
--- a/schemas/journal-v1.0.json
+++ b/schemas/journal-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/navbeaconscan-v1.0.json b/schemas/navbeaconscan-v1.0.json
index 81e089c..5fcab2c 100644
--- a/schemas/navbeaconscan-v1.0.json
+++ b/schemas/navbeaconscan-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/navroute-v1.0.json b/schemas/navroute-v1.0.json
index f160cd6..b0ef8d2 100644
--- a/schemas/navroute-v1.0.json
+++ b/schemas/navroute-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/outfitting-v2.0.json b/schemas/outfitting-v2.0.json
index eab688e..b3a0ad2 100644
--- a/schemas/outfitting-v2.0.json
+++ b/schemas/outfitting-v2.0.json
@@ -18,13 +18,11 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "From Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->gameversion, else LoadGame->gameversion, else 'CAPI-shipyard', else ''."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->build, else LoadGame->build, else 'CAPI-shipyard', else ''."
                 },
                 "softwareName": {
                     "type"          : "string"
diff --git a/schemas/scanbarycentre-v1.0.json b/schemas/scanbarycentre-v1.0.json
index 99df117..ccf263a 100644
--- a/schemas/scanbarycentre-v1.0.json
+++ b/schemas/scanbarycentre-v1.0.json
@@ -18,12 +18,10 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "From Fileheader event if available, else LoadGame if available there."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
                     "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
                 },
                 "softwareName": {
diff --git a/schemas/shipyard-v2.0.json b/schemas/shipyard-v2.0.json
index 3498e9b..a300271 100644
--- a/schemas/shipyard-v2.0.json
+++ b/schemas/shipyard-v2.0.json
@@ -18,13 +18,11 @@
                 },
                 "gameversion": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "From Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->gameversion, else LoadGame->gameversion, else 'CAPI-shipyard', else ''."
                 },
                 "gamebuild": {
                     "type"          : "string",
-                    "minLength"     : 1,
-                    "description"   : "The `build` value from a Fileheader event if available, else LoadGame if available there."
+                    "description"   : "Fileheader->build, else LoadGame->build, else 'CAPI-shipyard', else ''."
                 },
                 "softwareName": {
                     "type"          : "string"