diff --git a/common-imports.json b/common-imports.json
index bb7bc4d..3cb932d 100644
--- a/common-imports.json
+++ b/common-imports.json
@@ -11,6 +11,7 @@
 	"common_type__color__type": "common/unassigned",
 	"common_type__color_decimal__type": "common/unassigned",
 	"common_type__common_base__mChainsawState__type": "common/unassigned",
+	"common_type__common_base__mDisableSnapOn__type": "common/unassigned",
 	"common_type__common_base__mSnappedPassthroughs__type": "common/unassigned",
 	"common_type__empty_object__type": "common/unassigned",
 	"common_type__InfinityExtrap__type": "common/unassigned",
@@ -56,6 +57,7 @@
 	"common_type__common_base__FGBuildableDoor__automated__type": "classes/CoreUObject/FGBuildableDoor",
 	"common_type__common_base__FGBuildableDoor__base__type": "classes/CoreUObject/FGBuildableDoor",
 	"common_type__common_base__FGBuildableDroneStation__type": "classes/CoreUObject/FGBuildableDroneStation",
+	"common_type__common_base__FGBuildableFactory__generic__type": "classes/CoreUObject/FGBuildableFactory",
 	"common_type__common_base__FGBuildableFactory__jump_pad__type": "classes/CoreUObject/FGBuildableFactory",
 	"common_type__common_base__FGBuildableFactory__landing_pad__type": "classes/CoreUObject/FGBuildableFactory",
 	"common_type__common_base__FGBuildableMAM__type": "classes/CoreUObject/FGBuildableMAM",
@@ -68,6 +70,9 @@
 	"common_type__common_base__FGBuildablePowerPole__type": "classes/CoreUObject/FGBuildablePowerPole",
 	"common_type__common_base__FGBuildableRailroadTrack__type": "classes/CoreUObject/FGBuildableRailroadTrack",
 	"common_type__common_base__FGBuildableTradingPost__type": "classes/CoreUObject/FGBuildableTradingPost",
+	"common_type__common_base__FGBuildableWalkway__type": "classes/CoreUObject/FGBuildableWalkway",
+	"common_type__common_base__FGBuildableWalkway__base__type": "classes/CoreUObject/FGBuildableWalkway",
+	"common_type__common_base__FGBuildableWalkwayLightweight__type": "classes/CoreUObject/FGBuildableWalkwayLightweight",
 	"common_type__common_base__FGBuildableWall__base__type": "classes/CoreUObject/FGBuildableWall",
 	"common_type__common_base__FGBuildableWall__base__rectangle__type": "classes/CoreUObject/FGBuildableWall",
 	"common_type__common_base__FGBuildableWire__type": "classes/CoreUObject/FGBuildableWire",
diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts
index e28a7b0..7d00c8d 100644
--- a/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts
+++ b/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts
@@ -1,6 +1,7 @@
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
 import {
+	common_base__FGBuildableFactory__generic__type,
 	common_base__FGBuildableFactory__jump_pad__type,
 	common_base__FGBuildableFactory__landing_pad__type,
 } from '../../../common/classes/CoreUObject/FGBuildableFactory';
@@ -8,7 +9,11 @@ import {
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableFactory__generic__type =
-	FGBuildable__consumes_power_base__type;
+	FGBuildableFactory__generic__merged__type;
+
+export type FGBuildableFactory__generic__merged__type =
+	| common_base__FGBuildableFactory__generic__type
+	| FGBuildable__consumes_power_base__type;
 
 export type FGBuildableFactory__jump_pad__type =
 	FGBuildableFactory__jump_pad__merged__type;
diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableWalkway.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableWalkway.ts
index be2f9d8..04ee896 100644
--- a/generated-types/1.0/classes/CoreUObject/FGBuildableWalkway.ts
+++ b/generated-types/1.0/classes/CoreUObject/FGBuildableWalkway.ts
@@ -3,25 +3,24 @@ import {FGBuildableWalkwayLightweight__type} from './FGBuildableWalkwayLightweig
 import {FGBuildable__base__type} from './FGBuildable';
 
 import {
-	boolean__type,
-	decimal_string__type,
-} from '../../../common/common/scalar';
+	common_base__FGBuildableWalkway__base__type,
+	common_base__FGBuildableWalkway__type,
+} from '../../../common/classes/CoreUObject/FGBuildableWalkway';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableWalkway__type = FGBuildableWalkway__base__type & {
-	mDisableSnapOn: {
-		Right: boolean__type;
-		Left: boolean__type;
-		Top: boolean__type;
-		Bottom: boolean__type;
-	};
-};
+export type FGBuildableWalkway__type = FGBuildableWalkway__merged__type;
+
+export type FGBuildableWalkway__base__type =
+	FGBuildableWalkway__base__merged__type;
+
+export type FGBuildableWalkway__base__merged__type =
+	common_base__FGBuildableWalkway__base__type &
+		FGBuildable__base__type;
 
-export type FGBuildableWalkway__base__type = FGBuildable__base__type & {
-	mSize: decimal_string__type;
-	mElevation: decimal_string__type;
-};
+export type FGBuildableWalkway__merged__type =
+	common_base__FGBuildableWalkway__type &
+		FGBuildableWalkway__base__type;
 
 export type FGBuildableWalkway__NativeClass =
 	NativeClass__type & {
diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableWalkwayLightweight.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
index 12a66b9..41ad8a3 100644
--- a/generated-types/1.0/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
+++ b/generated-types/1.0/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
@@ -1,13 +1,15 @@
-import {mDisableSnapOn__type} from '../../common/unassigned';
-
 import {FGBuildableWalkway__base__type} from './FGBuildableWalkway';
 
+import {common_base__FGBuildableWalkwayLightweight__type} from '../../../common/classes/CoreUObject/FGBuildableWalkwayLightweight';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableWalkwayLightweight__type =
-	FGBuildableWalkway__base__type & {
-		mDisableSnapOn: mDisableSnapOn__type;
-	};
+	FGBuildableWalkwayLightweight__merged__type;
+
+export type FGBuildableWalkwayLightweight__merged__type =
+	common_base__FGBuildableWalkwayLightweight__type &
+		FGBuildableWalkway__base__type;
 
 export type FGBuildableWalkwayLightweight__NativeClass =
 	NativeClass__type & {
diff --git a/generated-types/common/classes/CoreUObject/FGBuildableFactory.ts b/generated-types/common/classes/CoreUObject/FGBuildableFactory.ts
index 49ddd94..503b1bf 100644
--- a/generated-types/common/classes/CoreUObject/FGBuildableFactory.ts
+++ b/generated-types/common/classes/CoreUObject/FGBuildableFactory.ts
@@ -1,6 +1,9 @@
+import {common_base__FGBuildable__consumes_power_base__type} from './FGBuildable';
+
 import {decimal_string__type} from '../../common/scalar';
 
-import {common_base__FGBuildable__consumes_power_base__type} from './FGBuildable';
+export type common_base__FGBuildableFactory__generic__type =
+	common_base__FGBuildable__consumes_power_base__type;
 
 export type common_base__FGBuildableFactory__jump_pad__type =
 	common_base__FGBuildable__consumes_power_base__type & {
diff --git a/generated-types/common/classes/CoreUObject/FGBuildableWalkway.ts b/generated-types/common/classes/CoreUObject/FGBuildableWalkway.ts
new file mode 100644
index 0000000..a037728
--- /dev/null
+++ b/generated-types/common/classes/CoreUObject/FGBuildableWalkway.ts
@@ -0,0 +1,19 @@
+import {boolean__type, decimal_string__type} from '../../common/scalar';
+
+import {common_base__FGBuildable__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableWalkway__type =
+	common_base__FGBuildableWalkway__base__type & {
+		mDisableSnapOn: {
+			Right: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+		};
+	};
+
+export type common_base__FGBuildableWalkway__base__type =
+	common_base__FGBuildable__base__type & {
+		mSize: decimal_string__type;
+		mElevation: decimal_string__type;
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGBuildableWalkwayLightweight.ts b/generated-types/common/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
new file mode 100644
index 0000000..dddb50a
--- /dev/null
+++ b/generated-types/common/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
@@ -0,0 +1,8 @@
+import {common_base__mDisableSnapOn__type} from '../../common/unassigned';
+
+import {common_base__FGBuildableWalkway__base__type} from './FGBuildableWalkway';
+
+export type common_base__FGBuildableWalkwayLightweight__type =
+	common_base__FGBuildableWalkway__base__type & {
+		mDisableSnapOn: common_base__mDisableSnapOn__type;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
index fa2ff4d..b67c048 100644
--- a/generated-types/common/common/unassigned.ts
+++ b/generated-types/common/common/unassigned.ts
@@ -27,6 +27,7 @@ import {common_base__FGBuildableBlueprintDesigner__type} from '../classes/CoreUO
 import {
 	common_base__FGBuildableFactory__jump_pad__type,
 	common_base__FGBuildableFactory__landing_pad__type,
+	common_base__FGBuildableFactory__generic__type,
 } from '../classes/CoreUObject/FGBuildableFactory';
 
 import {common_base__FGBuildableMAM__type} from '../classes/CoreUObject/FGBuildableMAM';
@@ -41,6 +42,13 @@ import {common_base__FGBuildableTradingPost__type} from '../classes/CoreUObject/
 
 import {common_base__FGBuildablePillarLightweight__type} from '../classes/CoreUObject/FGBuildablePillarLightweight';
 
+import {
+	common_base__FGBuildableWalkway__base__type,
+	common_base__FGBuildableWalkway__type,
+} from '../classes/CoreUObject/FGBuildableWalkway';
+
+import {common_base__FGBuildableWalkwayLightweight__type} from '../classes/CoreUObject/FGBuildableWalkwayLightweight';
+
 import {
 	FGSchematic__mUnlocks_mSchematics__mSchematics__type,
 	common_base__FGSchematic__mUnlocks__type,
@@ -178,6 +186,150 @@ export type color_decimal__type = {
 
 export type common_base__mChainsawState__type = None__type;
 
+export type common_base__mDisableSnapOn__type =
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Left: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Bottom: boolean__type;
+	}
+	| {
+			Top: boolean__type;
+	}
+	| {
+			Left: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Left: boolean__type;
+	}
+	| {
+			Left: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Left: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Left: boolean__type;
+	}
+	| {
+			Right: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Left: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Left: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Top: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Top: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Left: boolean__type;
+			Bottom: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Left: boolean__type;
+	}
+	| {
+			Front: boolean__type;
+			Right: boolean__type;
+			Left: boolean__type;
+			Top: boolean__type;
+	};
+
 export type common_base__mSnappedPassthroughs__type = '';
 
 export type empty_object__type = '()';
@@ -233,6 +385,11 @@ export type faux_11__type = class__type & {
 	FGBuildablePowerPole?: common_base__FGBuildablePowerPole__type;
 	FGBuildableTradingPost?: common_base__FGBuildableTradingPost__type;
 	FGBuildablePillarLightweight?: common_base__FGBuildablePillarLightweight__type;
+	FGBuildableFactory_generic?: common_base__FGBuildableFactory__generic__type;
+	FGBuildableWalkway_base?: common_base__FGBuildableWalkway__base__type;
+	mDisableSnapOn?: common_base__mDisableSnapOn__type;
+	FGBuildableWalkwayLightweight?: common_base__FGBuildableWalkwayLightweight__type;
+	FGBuildableWalkway?: common_base__FGBuildableWalkway__type;
 };
 
 export type faux_12__type = class__type & {
diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableFactory.ts b/generated-types/update8/classes/CoreUObject/FGBuildableFactory.ts
index 554c41a..d06e11b 100644
--- a/generated-types/update8/classes/CoreUObject/FGBuildableFactory.ts
+++ b/generated-types/update8/classes/CoreUObject/FGBuildableFactory.ts
@@ -1,6 +1,7 @@
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
 import {
+	common_base__FGBuildableFactory__generic__type,
 	common_base__FGBuildableFactory__jump_pad__type,
 	common_base__FGBuildableFactory__landing_pad__type,
 } from '../../../common/classes/CoreUObject/FGBuildableFactory';
@@ -8,7 +9,11 @@ import {
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableFactory__generic__type =
-	FGBuildable__consumes_power_base__type;
+	FGBuildableFactory__generic__merged__type;
+
+export type FGBuildableFactory__generic__merged__type =
+	| common_base__FGBuildableFactory__generic__type
+	| FGBuildable__consumes_power_base__type;
 
 export type FGBuildableFactory__jump_pad__type =
 	FGBuildableFactory__jump_pad__merged__type;
diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableWalkway.ts b/generated-types/update8/classes/CoreUObject/FGBuildableWalkway.ts
index be2f9d8..04ee896 100644
--- a/generated-types/update8/classes/CoreUObject/FGBuildableWalkway.ts
+++ b/generated-types/update8/classes/CoreUObject/FGBuildableWalkway.ts
@@ -3,25 +3,24 @@ import {FGBuildableWalkwayLightweight__type} from './FGBuildableWalkwayLightweig
 import {FGBuildable__base__type} from './FGBuildable';
 
 import {
-	boolean__type,
-	decimal_string__type,
-} from '../../../common/common/scalar';
+	common_base__FGBuildableWalkway__base__type,
+	common_base__FGBuildableWalkway__type,
+} from '../../../common/classes/CoreUObject/FGBuildableWalkway';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableWalkway__type = FGBuildableWalkway__base__type & {
-	mDisableSnapOn: {
-		Right: boolean__type;
-		Left: boolean__type;
-		Top: boolean__type;
-		Bottom: boolean__type;
-	};
-};
+export type FGBuildableWalkway__type = FGBuildableWalkway__merged__type;
+
+export type FGBuildableWalkway__base__type =
+	FGBuildableWalkway__base__merged__type;
+
+export type FGBuildableWalkway__base__merged__type =
+	common_base__FGBuildableWalkway__base__type &
+		FGBuildable__base__type;
 
-export type FGBuildableWalkway__base__type = FGBuildable__base__type & {
-	mSize: decimal_string__type;
-	mElevation: decimal_string__type;
-};
+export type FGBuildableWalkway__merged__type =
+	common_base__FGBuildableWalkway__type &
+		FGBuildableWalkway__base__type;
 
 export type FGBuildableWalkway__NativeClass =
 	NativeClass__type & {
diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableWalkwayLightweight.ts b/generated-types/update8/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
index 12a66b9..41ad8a3 100644
--- a/generated-types/update8/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
+++ b/generated-types/update8/classes/CoreUObject/FGBuildableWalkwayLightweight.ts
@@ -1,13 +1,15 @@
-import {mDisableSnapOn__type} from '../../common/unassigned';
-
 import {FGBuildableWalkway__base__type} from './FGBuildableWalkway';
 
+import {common_base__FGBuildableWalkwayLightweight__type} from '../../../common/classes/CoreUObject/FGBuildableWalkwayLightweight';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableWalkwayLightweight__type =
-	FGBuildableWalkway__base__type & {
-		mDisableSnapOn: mDisableSnapOn__type;
-	};
+	FGBuildableWalkwayLightweight__merged__type;
+
+export type FGBuildableWalkwayLightweight__merged__type =
+	common_base__FGBuildableWalkwayLightweight__type &
+		FGBuildableWalkway__base__type;
 
 export type FGBuildableWalkwayLightweight__NativeClass =
 	NativeClass__type & {
diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
index 9e595bf..e1580cb 100644
--- a/schema/1.0.schema.json
+++ b/schema/1.0.schema.json
@@ -3662,23 +3662,34 @@
 			"$ref": "#/$defs/FGBuildableFactory--landing-pad--merged",
 			"unevaluatedProperties": false
 		},
+		"FGBuildableFactory--generic--merged": {
+			"anyOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactory--generic"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--consumes-power-base"
+				}
+			]
+		},
 		"FGBuildableFactory--generic": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--consumes-power-base",
+			"$ref": "#/$defs/FGBuildableFactory--generic--merged",
 			"unevaluatedProperties": false
 		},
-		"FGBuildableWalkway--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"required": ["mSize", "mElevation", "mDisableSnapOn"],
-			"properties": {
-				"mSize": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+		"FGBuildableWalkway--base--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway--base"
 				},
-				"mElevation": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				}
-			}
+			]
+		},
+		"FGBuildableWalkway--base": {
+			"type": "object",
+			"$ref": "#/$defs/FGBuildableWalkway--base--merged"
 		},
 		"mDisableSnapOn": {
 			"type": "string",
@@ -3692,43 +3703,35 @@
 				}
 			}
 		},
+		"FGBuildableWalkwayLightweight--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkwayLightweight"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableWalkway--base"
+				}
+			]
+		},
 		"FGBuildableWalkwayLightweight": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--base",
-			"unevaluatedProperties": false,
-			"properties": {
-				"mDisableSnapOn": {
-					"$ref": "#/$defs/mDisableSnapOn"
+			"$ref": "#/$defs/FGBuildableWalkwayLightweight--merged",
+			"unevaluatedProperties": false
+		},
+		"FGBuildableWalkway--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableWalkway--base"
 				}
-			}
+			]
 		},
 		"FGBuildableWalkway": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--base",
-			"unevaluatedProperties": false,
-			"properties": {
-				"mDisableSnapOn": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"required": ["Right", "Left", "Top", "Bottom"],
-						"properties": {
-							"Right": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Left": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Top": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Bottom": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							}
-						}
-					}
-				}
-			}
+			"$ref": "#/$defs/FGBuildableWalkway--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildableGenerator--base": {
 			"type": "object",
diff --git a/schema/common.schema.json b/schema/common.schema.json
index 8752478..fc2c82e 100644
--- a/schema/common.schema.json
+++ b/schema/common.schema.json
@@ -3112,6 +3112,71 @@
 				}
 			}
 		},
+		"common-base--FGBuildableFactory--generic": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base"
+		},
+		"common-base--FGBuildableWalkway--base": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--base",
+			"required": ["mSize", "mElevation", "mDisableSnapOn"],
+			"properties": {
+				"mSize": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mElevation": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				}
+			}
+		},
+		"common-base--mDisableSnapOn": {
+			"type": "string",
+			"minLength": 1,
+			"typed_string": {
+				"minProperties": 1,
+				"patternProperties": {
+					"^(Front|Right|Left|Right|Top|Bottom)$": {
+						"$ref": "common.schema.json#/$defs/boolean"
+					}
+				}
+			}
+		},
+		"common-base--FGBuildableWalkwayLightweight": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway--base",
+			"properties": {
+				"mDisableSnapOn": {
+					"$ref": "common.schema.json#/$defs/common-base--mDisableSnapOn"
+				}
+			}
+		},
+		"common-base--FGBuildableWalkway": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway--base",
+			"properties": {
+				"mDisableSnapOn": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"required": ["Right", "Left", "Top", "Bottom"],
+						"properties": {
+							"Right": {
+								"$ref": "common.schema.json#/$defs/boolean"
+							},
+							"Left": {
+								"$ref": "common.schema.json#/$defs/boolean"
+							},
+							"Top": {
+								"$ref": "common.schema.json#/$defs/boolean"
+							},
+							"Bottom": {
+								"$ref": "common.schema.json#/$defs/boolean"
+							}
+						}
+					}
+				}
+			}
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -3393,6 +3458,21 @@
 				},
 				"FGBuildablePillarLightweight": {
 					"$ref": "#/$defs/common-base--FGBuildablePillarLightweight"
+				},
+				"FGBuildableFactory_generic": {
+					"$ref": "#/$defs/common-base--FGBuildableFactory--generic"
+				},
+				"FGBuildableWalkway_base": {
+					"$ref": "#/$defs/common-base--FGBuildableWalkway--base"
+				},
+				"mDisableSnapOn": {
+					"$ref": "#/$defs/common-base--mDisableSnapOn"
+				},
+				"FGBuildableWalkwayLightweight": {
+					"$ref": "#/$defs/common-base--FGBuildableWalkwayLightweight"
+				},
+				"FGBuildableWalkway": {
+					"$ref": "#/$defs/common-base--FGBuildableWalkway"
 				}
 			}
 		},
diff --git a/schema/update8.schema.json b/schema/update8.schema.json
index 93fab1a..4d4c466 100644
--- a/schema/update8.schema.json
+++ b/schema/update8.schema.json
@@ -1445,23 +1445,34 @@
 			"$ref": "#/$defs/FGBuildableFactory--landing-pad--merged",
 			"unevaluatedProperties": false
 		},
+		"FGBuildableFactory--generic--merged": {
+			"anyOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactory--generic"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--consumes-power-base"
+				}
+			]
+		},
 		"FGBuildableFactory--generic": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--consumes-power-base",
+			"$ref": "#/$defs/FGBuildableFactory--generic--merged",
 			"unevaluatedProperties": false
 		},
-		"FGBuildableWalkway--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"required": ["mSize", "mElevation", "mDisableSnapOn"],
-			"properties": {
-				"mSize": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+		"FGBuildableWalkway--base--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway--base"
 				},
-				"mElevation": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				}
-			}
+			]
+		},
+		"FGBuildableWalkway--base": {
+			"type": "object",
+			"$ref": "#/$defs/FGBuildableWalkway--base--merged"
 		},
 		"mDisableSnapOn": {
 			"type": "string",
@@ -1475,43 +1486,35 @@
 				}
 			}
 		},
+		"FGBuildableWalkwayLightweight--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkwayLightweight"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableWalkway--base"
+				}
+			]
+		},
 		"FGBuildableWalkwayLightweight": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--base",
-			"unevaluatedProperties": false,
-			"properties": {
-				"mDisableSnapOn": {
-					"$ref": "#/$defs/mDisableSnapOn"
+			"$ref": "#/$defs/FGBuildableWalkwayLightweight--merged",
+			"unevaluatedProperties": false
+		},
+		"FGBuildableWalkway--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableWalkway--base"
 				}
-			}
+			]
 		},
 		"FGBuildableWalkway": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--base",
-			"unevaluatedProperties": false,
-			"properties": {
-				"mDisableSnapOn": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"required": ["Right", "Left", "Top", "Bottom"],
-						"properties": {
-							"Right": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Left": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Top": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							},
-							"Bottom": {
-								"$ref": "common.schema.json#/$defs/boolean"
-							}
-						}
-					}
-				}
-			}
+			"$ref": "#/$defs/FGBuildableWalkway--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildableGenerator--base": {
 			"type": "object",
diff --git a/types-progress--common.md b/types-progress--common.md
index b109da7..9d0eb6c 100644
--- a/types-progress--common.md
+++ b/types-progress--common.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (203 of 203)
+100.00% Complete (210 of 210)
 
 ## Basic Types
 
@@ -76,6 +76,7 @@
 -   [x] common-base--FGBuildableDoor--automated
 -   [x] common-base--FGBuildableDoor--base (common type)
 -   [x] common-base--FGBuildableDroneStation
+-   [x] common-base--FGBuildableFactory--generic
 -   [x] common-base--FGBuildableFactory--jump-pad
 -   [x] common-base--FGBuildableFactory--landing-pad
 -   [x] common-base--FGBuildableMAM
@@ -88,6 +89,9 @@
 -   [x] common-base--FGBuildablePowerPole
 -   [x] common-base--FGBuildableRailroadTrack
 -   [x] common-base--FGBuildableTradingPost
+-   [x] common-base--FGBuildableWalkway
+-   [x] common-base--FGBuildableWalkway--base (common type)
+-   [x] common-base--FGBuildableWalkwayLightweight
 -   [x] common-base--FGBuildableWall--base (common type)
 -   [x] common-base--FGBuildableWall--base--rectangle (common type)
 -   [x] common-base--FGBuildableWire
@@ -128,6 +132,7 @@
 -   [x] common-base--FGSchematic--with-unlocks
 -   [x] common-base--FGSuitBase
 -   [x] common-base--mChainsawState (common type)
+-   [x] common-base--mDisableSnapOn (common type)
 -   [x] common-base--mSnappedPassthroughs (common type)
 
 ## FGSchematic
diff --git a/types-progress--update8.md b/types-progress--update8.md
index 030e7e7..388fe96 100644
--- a/types-progress--update8.md
+++ b/types-progress--update8.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (330 of 330)
+100.00% Complete (339 of 339)
 
 ## Basic Types
 
@@ -60,6 +60,7 @@
 -   [x] common-base--FGBuildableDoor--automated (common type)
 -   [x] common-base--FGBuildableDoor--base (common type)
 -   [x] common-base--FGBuildableDroneStation (common type)
+-   [x] common-base--FGBuildableFactory--generic (common type)
 -   [x] common-base--FGBuildableFactory--jump-pad (common type)
 -   [x] common-base--FGBuildableFactory--landing-pad (common type)
 -   [x] common-base--FGBuildableMAM (common type)
@@ -72,6 +73,9 @@
 -   [x] common-base--FGBuildablePowerPole (common type)
 -   [x] common-base--FGBuildableRailroadTrack (common type)
 -   [x] common-base--FGBuildableTradingPost (common type)
+-   [x] common-base--FGBuildableWalkway (common type)
+-   [x] common-base--FGBuildableWalkway--base (common type)
+-   [x] common-base--FGBuildableWalkwayLightweight (common type)
 -   [x] common-base--FGBuildableWall--base (common type)
 -   [x] common-base--FGBuildableWall--base--rectangle (common type)
 -   [x] common-base--FGBuildableWire (common type)
@@ -112,6 +116,7 @@
 -   [x] common-base--FGSchematic--with-unlocks (common type)
 -   [x] common-base--FGSuitBase (common type)
 -   [x] common-base--mChainsawState (common type)
+-   [x] common-base--mDisableSnapOn (common type)
 -   [x] common-base--mSnappedPassthroughs (common type)
 
 ## FGAmmoType
@@ -237,6 +242,7 @@
 ## FGBuildableFactory
 
 -   [x] FGBuildableFactory--generic
+-   [x] FGBuildableFactory--generic--merged
 -   [x] FGBuildableFactory--jump-pad
 -   [x] FGBuildableFactory--jump-pad--merged
 -   [x] FGBuildableFactory--landing-pad
@@ -326,6 +332,12 @@
 ## FGBuildableWalkway
 
 -   [x] FGBuildableWalkway--base
+-   [x] FGBuildableWalkway--base--merged
+-   [x] FGBuildableWalkway--merged
+
+## FGBuildableWalkwayLightweight
+
+-   [x] FGBuildableWalkwayLightweight--merged
 
 ## FGBuildableWall
 
diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md
index 79ad0e8..7812d62 100644
--- a/types-progress--version_1_0_0_4.md
+++ b/types-progress--version_1_0_0_4.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (367 of 367)
+100.00% Complete (376 of 376)
 
 ## Basic Types
 
@@ -66,6 +66,7 @@
 -   [x] common-base--FGBuildableDoor--automated (common type)
 -   [x] common-base--FGBuildableDoor--base (common type)
 -   [x] common-base--FGBuildableDroneStation (common type)
+-   [x] common-base--FGBuildableFactory--generic (common type)
 -   [x] common-base--FGBuildableFactory--jump-pad (common type)
 -   [x] common-base--FGBuildableFactory--landing-pad (common type)
 -   [x] common-base--FGBuildableMAM (common type)
@@ -78,6 +79,9 @@
 -   [x] common-base--FGBuildablePowerPole (common type)
 -   [x] common-base--FGBuildableRailroadTrack (common type)
 -   [x] common-base--FGBuildableTradingPost (common type)
+-   [x] common-base--FGBuildableWalkway (common type)
+-   [x] common-base--FGBuildableWalkway--base (common type)
+-   [x] common-base--FGBuildableWalkwayLightweight (common type)
 -   [x] common-base--FGBuildableWall--base (common type)
 -   [x] common-base--FGBuildableWall--base--rectangle (common type)
 -   [x] common-base--FGBuildableWire (common type)
@@ -117,6 +121,7 @@
 -   [x] common-base--FGSchematic--with-unlocks (common type)
 -   [x] common-base--FGSuitBase (common type)
 -   [x] common-base--mChainsawState (common type)
+-   [x] common-base--mDisableSnapOn (common type)
 -   [x] common-base--mSnappedPassthroughs (common type)
 
 ## FGAmmoType
@@ -247,6 +252,7 @@
 ## FGBuildableFactory
 
 -   [x] FGBuildableFactory--generic
+-   [x] FGBuildableFactory--generic--merged
 -   [x] FGBuildableFactory--jump-pad
 -   [x] FGBuildableFactory--jump-pad--merged
 -   [x] FGBuildableFactory--landing-pad
@@ -357,6 +363,12 @@
 ## FGBuildableWalkway
 
 -   [x] FGBuildableWalkway--base
+-   [x] FGBuildableWalkway--base--merged
+-   [x] FGBuildableWalkway--merged
+
+## FGBuildableWalkwayLightweight
+
+-   [x] FGBuildableWalkwayLightweight--merged
 
 ## FGBuildableWall