@xyo-network/witness-model 2.73.4 → 2.74.1

package/dist/docs.json

@@ -20,10 +20,10 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+							"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 							"line": 15,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L15"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L15"
 						}
 					],
 					"type": {
@@ -46,8 +46,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -69,9 +69,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -95,10 +95,10 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 8,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L8"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L8"
 												}
 											],
 											"type": {
@@ -124,81 +124,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 9,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L9"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L9"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 67,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 67,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 68,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 68,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			68
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	68
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										},
@@ -212,81 +189,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 10,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L10"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L10"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 70,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 70,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 71,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 71,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			71
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	71
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										}
@@ -303,10 +257,10 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 											"line": 7,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L7"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L7"
 										}
 									]
 								}
@@ -325,10 +279,10 @@
 			],
 			"sources": [
 				{
-					"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+					"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 					"line": 14,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L14"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L14"
 				}
 			],
 			"typeParameters": [
@@ -341,7 +295,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -350,7 +304,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -362,7 +316,7 @@
 				{
 					"type": "reference",
 					"target": {
-						"sourceFileName": "../../../module/packages/events/dist/index.d.ts",
+						"sourceFileName": "../../../module/packages/events/src/model/Event.ts",
 						"qualifiedName": "EventData"
 					},
 					"name": "EventData",
@@ -392,10 +346,10 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+							"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 							"line": 13,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L13"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L13"
 						}
 					],
 					"type": {
@@ -418,8 +372,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -441,9 +395,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -467,81 +421,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 													"line": 8,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L8"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L8"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 83,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 83,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 84,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 84,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			84
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	84
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										}
@@ -556,10 +487,10 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 											"line": 7,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L7"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L7"
 										}
 									]
 								}
@@ -578,10 +509,10 @@
 			],
 			"sources": [
 				{
-					"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+					"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 					"line": 12,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L12"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L12"
 				}
 			],
 			"typeParameters": [
@@ -594,7 +525,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -603,7 +534,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -615,7 +546,7 @@
 				{
 					"type": "reference",
 					"target": {
-						"sourceFileName": "../../../module/packages/events/dist/index.d.ts",
+						"sourceFileName": "../../../module/packages/events/src/model/Event.ts",
 						"qualifiedName": "EventData"
 					},
 					"name": "EventData",
@@ -631,14 +562,14 @@
 			]
 		},
 		{
-			"id": 153,
+			"id": 157,
 			"name": "Witness",
 			"variant": "declaration",
 			"kind": 256,
 			"flags": {},
 			"children": [
 				{
-					"id": 154,
+					"id": 158,
 					"name": "observe",
 					"variant": "declaration",
 					"kind": 1024,
@@ -648,13 +579,13 @@
 							"fileName": "modules/packages/witness/packages/model/src/Witness.ts",
 							"line": 5,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
 						}
 					],
 					"type": {
 						"type": "reflection",
 						"declaration": {
-							"id": 155,
+							"id": 159,
 							"name": "__type",
 							"variant": "declaration",
 							"kind": 65536,
@@ -664,12 +595,12 @@
 									"fileName": "modules/packages/witness/packages/model/src/Witness.ts",
 									"line": 5,
 									"character": 11,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
 								}
 							],
 							"signatures": [
 								{
-									"id": 156,
+									"id": 160,
 									"name": "__type",
 									"variant": "signature",
 									"kind": 4096,
@@ -679,12 +610,12 @@
 											"fileName": "modules/packages/witness/packages/model/src/Witness.ts",
 											"line": 5,
 											"character": 11,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Witness.ts#L5"
 										}
 									],
 									"parameters": [
 										{
-											"id": 157,
+											"id": 161,
 											"name": "payloads",
 											"variant": "param",
 											"kind": 32768,
@@ -694,72 +625,49 @@
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 158,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 162,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 163,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 159,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			159
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	163
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										}
@@ -767,79 +675,56 @@
 									"type": {
 										"type": "reference",
 										"target": {
-											"sourceFileName": "../../../../../shared/packages/promise/dist/index.d.ts",
+											"sourceFileName": "../../../../../shared/packages/promise/src/types.ts",
 											"qualifiedName": "Promisable"
 										},
 										"typeArguments": [
 											{
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 160,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 164,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 165,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 161,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			161
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	165
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										],
@@ -856,7 +741,7 @@
 				{
 					"title": "Properties",
 					"children": [
-						154
+						158
 					]
 				}
 			],
@@ -865,7 +750,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Witness.ts",
 					"line": 4,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Witness.ts#L4"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Witness.ts#L4"
 				}
 			]
 		},
@@ -884,8 +769,8 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-							"line": 78,
+							"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleBusy.d.ts",
+							"line": 7,
 							"character": 4
 						}
 					],
@@ -909,8 +794,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -932,9 +817,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -956,8 +841,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 75,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleBusy.d.ts",
+													"line": 4,
 													"character": 4
 												}
 											],
@@ -977,9 +862,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 74,
-											"character": 85
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleBusy.d.ts",
+											"line": 3,
+											"character": 92
 										}
 									]
 								}
@@ -1000,8 +885,8 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-							"line": 85,
+							"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleError.d.ts",
+							"line": 7,
 							"character": 4
 						}
 					],
@@ -1025,8 +910,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -1048,9 +933,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -1072,8 +957,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 82,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleError.d.ts",
+													"line": 4,
 													"character": 4
 												}
 											],
@@ -1098,9 +983,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 81,
-											"character": 86
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleError.d.ts",
+											"line": 3,
+											"character": 93
 										}
 									]
 								}
@@ -1121,8 +1006,8 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-							"line": 96,
+							"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleQueried.d.ts",
+							"line": 12,
 							"character": 4
 						}
 					],
@@ -1146,8 +1031,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -1169,9 +1054,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -1195,80 +1080,57 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 91,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleQueried.d.ts",
+													"line": 7,
 													"character": 4
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 33,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 33,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 34,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 34,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			34
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	34
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										},
@@ -1280,8 +1142,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 92,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleQueried.d.ts",
+													"line": 8,
 													"character": 4
 												}
 											],
@@ -1291,7 +1153,7 @@
 													{
 														"type": "reference",
 														"target": {
-															"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+															"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 															"qualifiedName": "SchemaFields"
 														},
 														"name": "SchemaFields",
@@ -1300,7 +1162,7 @@
 													{
 														"type": "reference",
 														"target": {
-															"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+															"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 															"qualifiedName": "PayloadFields"
 														},
 														"name": "PayloadFields",
@@ -1309,96 +1171,116 @@
 													{
 														"type": "reference",
 														"target": {
-															"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/model/dist/index.d.ts",
-															"qualifiedName": "BoundWitnessFields"
+															"sourceFileName": "../../../../../../node_modules/typescript/lib/lib.es5.d.ts",
+															"qualifiedName": "Omit"
 														},
-														"name": "BoundWitnessFields",
-														"package": "@xyo-network/boundwitness-model"
-													},
-													{
-														"type": "reflection",
-														"declaration": {
-															"id": 36,
-															"name": "__type",
-															"variant": "declaration",
-															"kind": 65536,
-															"flags": {},
-															"children": [
-																{
-																	"id": 37,
-																	"name": "query",
-																	"variant": "declaration",
-																	"kind": 1024,
-																	"flags": {},
-																	"sources": [
-																		{
-																			"fileName": "protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
-																			"line": 51,
-																			"character": 4
-																		}
-																	],
-																	"type": {
-																		"type": "intrinsic",
-																		"name": "string"
-																	}
-																},
-																{
-																	"id": 38,
-																	"name": "resultSet",
-																	"variant": "declaration",
-																	"kind": 1024,
-																	"flags": {
-																		"isOptional": true
+														"typeArguments": [
+															{
+																"type": "intersection",
+																"types": [
+																	{
+																		"type": "reference",
+																		"target": {
+																			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/model/src/models/BoundWitness.ts",
+																			"qualifiedName": "BoundWitnessFields"
+																		},
+																		"name": "BoundWitnessFields",
+																		"package": "@xyo-network/boundwitness-model"
 																	},
-																	"sources": [
-																		{
-																			"fileName": "protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
-																			"line": 52,
-																			"character": 4
-																		}
-																	],
-																	"type": {
-																		"type": "intrinsic",
-																		"name": "string"
-																	}
-																},
-																{
-																	"id": 39,
-																	"name": "schema",
-																	"variant": "declaration",
-																	"kind": 1024,
-																	"flags": {},
-																	"sources": [
-																		{
-																			"fileName": "protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
-																			"line": 53,
-																			"character": 4
+																	{
+																		"type": "reflection",
+																		"declaration": {
+																			"id": 36,
+																			"name": "__type",
+																			"variant": "declaration",
+																			"kind": 65536,
+																			"flags": {},
+																			"children": [
+																				{
+																					"id": 37,
+																					"name": "query",
+																					"variant": "declaration",
+																					"kind": 1024,
+																					"flags": {},
+																					"sources": [
+																						{
+																							"fileName": "protocol/packages/boundwitness/packages/builder/dist/Query/QueryBoundWitness.d.ts",
+																							"line": 6,
+																							"character": 4
+																						}
+																					],
+																					"type": {
+																						"type": "intrinsic",
+																						"name": "string"
+																					}
+																				},
+																				{
+																					"id": 38,
+																					"name": "resultSet",
+																					"variant": "declaration",
+																					"kind": 1024,
+																					"flags": {
+																						"isOptional": true
+																					},
+																					"sources": [
+																						{
+																							"fileName": "protocol/packages/boundwitness/packages/builder/dist/Query/QueryBoundWitness.d.ts",
+																							"line": 7,
+																							"character": 4
+																						}
+																					],
+																					"type": {
+																						"type": "intrinsic",
+																						"name": "string"
+																					}
+																				},
+																				{
+																					"id": 39,
+																					"name": "schema",
+																					"variant": "declaration",
+																					"kind": 1024,
+																					"flags": {},
+																					"sources": [
+																						{
+																							"fileName": "protocol/packages/boundwitness/packages/builder/dist/Query/QueryBoundWitness.d.ts",
+																							"line": 8,
+																							"character": 4
+																						}
+																					],
+																					"type": {
+																						"type": "literal",
+																						"value": "network.xyo.boundwitness"
+																					}
+																				}
+																			],
+																			"groups": [
+																				{
+																					"title": "Properties",
+																					"children": [
+																						37,
+																						38,
+																						39
+																					]
+																				}
+																			],
+																			"sources": [
+																				{
+																					"fileName": "protocol/packages/boundwitness/packages/builder/dist/Query/QueryBoundWitness.d.ts",
+																					"line": 5,
+																					"character": 45
+																				}
+																			]
 																		}
-																	],
-																	"type": {
-																		"type": "literal",
-																		"value": "network.xyo.boundwitness"
 																	}
-																}
-															],
-															"groups": [
-																{
-																	"title": "Properties",
-																	"children": [
-																		37,
-																		38,
-																		39
-																	]
-																}
-															],
-															"sources": [
-																{
-																	"fileName": "protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
-																	"line": 50,
-																	"character": 38
-																}
-															]
-														}
+																]
+															},
+															{
+																"type": "literal",
+																"value": "schema"
+															}
+														],
+														"name": "Omit",
+														"package": "typescript"
 													},
 													{
 														"type": "reflection",
@@ -1417,7 +1299,7 @@
 																	"flags": {},
 																	"sources": [
 																		{
-																			"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
+																			"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
 																			"line": 17,
 																			"character": 4
 																		}
@@ -1438,9 +1320,9 @@
 															],
 															"sources": [
 																{
-																	"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
+																	"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
 																	"line": 16,
-																	"character": 171
+																	"character": 173
 																}
 															]
 														}
@@ -1456,15 +1338,15 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 93,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleQueried.d.ts",
+													"line": 9,
 													"character": 4
 												}
 											],
 											"type": {
 												"type": "reference",
 												"target": {
-													"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+													"sourceFileName": "../../../module/packages/model/src/ModuleQueryResult.ts",
 													"qualifiedName": "ModuleQueryResult"
 												},
 												"name": "ModuleQueryResult",
@@ -1484,9 +1366,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 90,
-											"character": 88
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleQueried.d.ts",
+											"line": 6,
+											"character": 95
 										}
 									]
 								}
@@ -1507,10 +1389,10 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+							"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 							"line": 15,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L15"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L15"
 						}
 					],
 					"type": {
@@ -1533,8 +1415,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -1556,9 +1438,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -1582,10 +1464,10 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 8,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L8"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L8"
 												}
 											],
 											"type": {
@@ -1611,81 +1493,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 9,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L9"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L9"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 16,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 16,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 17,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 17,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			17
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	17
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										},
@@ -1699,81 +1558,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 													"line": 10,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L10"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L10"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 19,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 19,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 20,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 20,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			20
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	20
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										}
@@ -1790,10 +1626,10 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 											"line": 7,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L7"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L7"
 										}
 									]
 								}
@@ -1814,10 +1650,10 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+							"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 							"line": 13,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L13"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L13"
 						}
 					],
 					"type": {
@@ -1840,8 +1676,8 @@
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 69,
+													"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+													"line": 3,
 													"character": 4
 												}
 											],
@@ -1863,9 +1699,9 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 68,
-											"character": 131
+											"fileName": "modules/packages/module/packages/model/dist/EventsModels/ModuleEventArgs.d.ts",
+											"line": 2,
+											"character": 138
 										}
 									]
 								}
@@ -1889,81 +1725,58 @@
 											},
 											"sources": [
 												{
-													"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+													"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 													"line": 8,
 													"character": 4,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L8"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L8"
 												}
 											],
 											"type": {
 												"type": "array",
 												"elementType": {
-													"type": "intersection",
-													"types": [
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "SchemaFields"
-															},
-															"name": "SchemaFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reference",
-															"target": {
-																"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
-																"qualifiedName": "PayloadFields"
-															},
-															"name": "PayloadFields",
-															"package": "@xyo-network/payload-model"
-														},
-														{
-															"type": "reflection",
-															"declaration": {
-																"id": 26,
-																"name": "__type",
+													"type": "reflection",
+													"declaration": {
+														"id": 26,
+														"name": "__type",
+														"variant": "declaration",
+														"kind": 65536,
+														"flags": {},
+														"children": [
+															{
+																"id": 27,
+																"name": "schema",
 																"variant": "declaration",
-																"kind": 65536,
+																"kind": 1024,
 																"flags": {},
-																"children": [
-																	{
-																		"id": 27,
-																		"name": "schema",
-																		"variant": "declaration",
-																		"kind": 1024,
-																		"flags": {},
-																		"sources": [
-																			{
-																				"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																				"line": 19,
-																				"character": 4
-																			}
-																		],
-																		"type": {
-																			"type": "intrinsic",
-																			"name": "string"
-																		}
-																	}
-																],
-																"groups": [
-																	{
-																		"title": "Properties",
-																		"children": [
-																			27
-																		]
-																	}
-																],
 																"sources": [
 																	{
-																		"fileName": "protocol/packages/payload/packages/model/dist/index.d.ts",
-																		"line": 18,
-																		"character": 17
+																		"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																		"line": 23,
+																		"character": 4
 																	}
+																],
+																"type": {
+																	"type": "intrinsic",
+																	"name": "string"
+																}
+															}
+														],
+														"groups": [
+															{
+																"title": "Properties",
+																"children": [
+																	27
 																]
 															}
-														}
-													]
+														],
+														"sources": [
+															{
+																"fileName": "protocol/packages/payload/packages/model/dist/Payload.d.ts",
+																"line": 22,
+																"character": 5
+															}
+														]
+													}
 												}
 											}
 										}
@@ -1978,10 +1791,10 @@
 									],
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 											"line": 7,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L7"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L7"
 										}
 									]
 								}
@@ -2012,7 +1825,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/EventData.ts",
 					"line": 5,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/EventData.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventData.ts#L5"
 				}
 			],
 			"typeParameters": [
@@ -2025,7 +1838,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2034,7 +1847,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2074,7 +1887,7 @@
 				{
 					"type": "reference",
 					"target": {
-						"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+						"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventData.ts",
 						"qualifiedName": "ModuleEventData"
 					},
 					"typeArguments": [
@@ -2101,7 +1914,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Instance.ts",
 					"line": 10,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Instance.ts#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Instance.ts#L10"
 				}
 			],
 			"typeParameters": [
@@ -2201,14 +2014,14 @@
 					},
 					{
 						"type": "reference",
-						"target": 153,
+						"target": 157,
 						"name": "Witness",
 						"package": "@xyo-network/witness-model"
 					},
 					{
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/instance/ModuleInstance.ts",
 							"qualifiedName": "ModuleInstance"
 						},
 						"name": "ModuleInstance",
@@ -2228,7 +2041,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Module.ts",
 					"line": 8,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Module.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Module.ts#L8"
 				}
 			],
 			"typeParameters": [
@@ -2306,7 +2119,7 @@
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 					"qualifiedName": "Module"
 				},
 				"typeArguments": [
@@ -2335,10 +2148,10 @@
 			"flags": {},
 			"sources": [
 				{
-					"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+					"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 					"line": 5,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L5"
 				}
 			],
 			"typeParameters": [
@@ -2351,7 +2164,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2360,7 +2173,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2371,7 +2184,7 @@
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 					"qualifiedName": "ModuleEventArgs"
 				},
 				"typeArguments": [
@@ -2400,10 +2213,10 @@
 									},
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 											"line": 8,
 											"character": 4,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L8"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L8"
 										}
 									],
 									"type": {
@@ -2429,10 +2242,10 @@
 									},
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 											"line": 9,
 											"character": 4,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L9"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L9"
 										}
 									],
 									"type": {
@@ -2440,7 +2253,7 @@
 										"elementType": {
 											"type": "reference",
 											"target": {
-												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 												"qualifiedName": "Payload"
 											},
 											"name": "Payload",
@@ -2458,10 +2271,10 @@
 									},
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 											"line": 10,
 											"character": 4,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L10"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L10"
 										}
 									],
 									"type": {
@@ -2469,7 +2282,7 @@
 										"elementType": {
 											"type": "reference",
 											"target": {
-												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 												"qualifiedName": "Payload"
 											},
 											"name": "Payload",
@@ -2490,10 +2303,10 @@
 							],
 							"sources": [
 								{
-									"fileName": "modules/packages/witness/packages/model/src/Events/ObserveEnd.ts",
+									"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts",
 									"line": 7,
 									"character": 2,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveEnd.ts#L7"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveEnd.ts#L7"
 								}
 							]
 						}
@@ -2511,10 +2324,10 @@
 			"flags": {},
 			"sources": [
 				{
-					"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+					"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 					"line": 5,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L5"
 				}
 			],
 			"typeParameters": [
@@ -2527,7 +2340,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2536,7 +2349,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 							"qualifiedName": "Module"
 						},
 						"name": "Module",
@@ -2547,7 +2360,7 @@
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 					"qualifiedName": "ModuleEventArgs"
 				},
 				"typeArguments": [
@@ -2576,10 +2389,10 @@
 									},
 									"sources": [
 										{
-											"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+											"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 											"line": 8,
 											"character": 4,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L8"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L8"
 										}
 									],
 									"type": {
@@ -2587,7 +2400,7 @@
 										"elementType": {
 											"type": "reference",
 											"target": {
-												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+												"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 												"qualifiedName": "Payload"
 											},
 											"name": "Payload",
@@ -2606,10 +2419,10 @@
 							],
 							"sources": [
 								{
-									"fileName": "modules/packages/witness/packages/model/src/Events/ObserveStart.ts",
+									"fileName": "modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts",
 									"line": 7,
 									"character": 2,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Events/ObserveStart.ts#L7"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/EventsModels/ObserveStart.ts#L7"
 								}
 							]
 						}
@@ -2630,7 +2443,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 					"line": 8,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L8"
 				}
 			],
 			"typeParameters": [
@@ -2646,7 +2459,7 @@
 							{
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 									"qualifiedName": "Payload"
 								},
 								"name": "Payload",
@@ -2654,27 +2467,27 @@
 							},
 							{
 								"type": "intrinsic",
-								"name": "undefined"
+								"name": "void"
 							}
 						]
 					},
 					"default": {
 						"type": "intrinsic",
-						"name": "undefined"
+						"name": "void"
 					}
 				}
 			],
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/Config.ts",
 					"qualifiedName": "ModuleConfig"
 				},
 				"typeArguments": [
 					{
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../../../protocol/packages/core/dist/index.d.ts",
+							"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/WithAdditional.ts",
 							"qualifiedName": "WithAdditional"
 						},
 						"typeArguments": [
@@ -2700,7 +2513,7 @@
 													"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 													"line": 11,
 													"character": 6,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L11"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L11"
 												}
 											],
 											"type": {
@@ -2719,7 +2532,7 @@
 													"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 													"line": 12,
 													"character": 6,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L12"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L12"
 												}
 											],
 											"type": {
@@ -2733,7 +2546,7 @@
 												"extendsType": {
 													"type": "reference",
 													"target": {
-														"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+														"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 														"qualifiedName": "Payload"
 													},
 													"name": "Payload",
@@ -2773,13 +2586,13 @@
 													"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 													"line": 13,
 													"character": 6,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L13"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L13"
 												}
 											],
 											"type": {
 												"type": "reference",
 												"target": {
-													"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+													"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/PayloadSet/PayloadSetPayload.ts",
 													"qualifiedName": "PayloadSetPayload"
 												},
 												"name": "PayloadSetPayload",
@@ -2802,7 +2615,7 @@
 											"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 											"line": 10,
 											"character": 4,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L10"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L10"
 										}
 									]
 								}
@@ -2815,7 +2628,7 @@
 							}
 						],
 						"name": "WithAdditional",
-						"package": "@xyo-network/core"
+						"package": "@xyo-network/object"
 					}
 				],
 				"name": "ModuleConfig",
@@ -2833,13 +2646,13 @@
 					"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 					"line": 5,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L5"
 				},
 				{
 					"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 					"line": 6,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L6"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L6"
 				}
 			],
 			"type": {
@@ -2858,7 +2671,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Instance.ts",
 					"line": 8,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Instance.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Instance.ts#L8"
 				}
 			],
 			"typeParameters": [
@@ -2901,14 +2714,14 @@
 					},
 					{
 						"type": "reference",
-						"target": 153,
+						"target": 157,
 						"name": "Witness",
 						"package": "@xyo-network/witness-model"
 					},
 					{
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/instance/ModuleInstance.ts",
 							"qualifiedName": "ModuleInstance"
 						},
 						"name": "ModuleInstance",
@@ -2928,7 +2741,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Module.ts",
 					"line": 6,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Module.ts#L6"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Module.ts#L6"
 				}
 			],
 			"typeParameters": [
@@ -2955,7 +2768,7 @@
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/module/Module.ts",
 					"qualifiedName": "Module"
 				},
 				"typeArguments": [
@@ -2995,7 +2808,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/index.ts",
 					"line": 9,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L9"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L9"
 				}
 			],
 			"type": {
@@ -3004,7 +2817,7 @@
 					{
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/Queries/index.ts",
 							"qualifiedName": "ModuleQueryBase"
 						},
 						"name": "ModuleQueryBase",
@@ -3030,13 +2843,13 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 					"line": 6,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L6"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L6"
 				}
 			],
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Query.ts",
 					"qualifiedName": "Query"
 				},
 				"typeArguments": [
@@ -3062,7 +2875,7 @@
 											"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 											"line": 7,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L7"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L7"
 										}
 									],
 									"type": {
@@ -3084,7 +2897,7 @@
 											"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 											"line": 8,
 											"character": 2,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L8"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L8"
 										}
 									],
 									"type": {
@@ -3109,7 +2922,7 @@
 									"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 									"line": 6,
 									"character": 40,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L6"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L6"
 								}
 							]
 						}
@@ -3130,13 +2943,13 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 					"line": 3,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L3"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L3"
 				},
 				{
 					"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 					"line": 4,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L4"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L4"
 				}
 			],
 			"type": {
@@ -3153,9 +2966,9 @@
 			"sources": [
 				{
 					"fileName": "modules/packages/witness/packages/model/src/Params.ts",
-					"line": 5,
+					"line": 6,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Params.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Params.ts#L6"
 				}
 			],
 			"typeParameters": [
@@ -3168,7 +2981,7 @@
 					"type": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/Config.ts",
 							"qualifiedName": "AnyConfigSchema"
 						},
 						"typeArguments": [
@@ -3185,7 +2998,7 @@
 					"default": {
 						"type": "reference",
 						"target": {
-							"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+							"sourceFileName": "../../../module/packages/model/src/Config.ts",
 							"qualifiedName": "AnyConfigSchema"
 						},
 						"typeArguments": [
@@ -3212,28 +3025,28 @@
 							{
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../protocol/packages/core/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AnyObject.ts",
 									"qualifiedName": "AnyObject"
 								},
 								"name": "AnyObject",
-								"package": "@xyo-network/core"
+								"package": "@xyo-network/object"
 							},
 							{
 								"type": "intrinsic",
-								"name": "undefined"
+								"name": "void"
 							}
 						]
 					},
 					"default": {
 						"type": "intrinsic",
-						"name": "undefined"
+						"name": "void"
 					}
 				}
 			],
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/ModuleParams.ts",
 					"qualifiedName": "ModuleParams"
 				},
 				"typeArguments": [
@@ -3265,7 +3078,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/index.ts",
 					"line": 10,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L10"
 				}
 			],
 			"typeParameters": [
@@ -3281,7 +3094,7 @@
 							{
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Query.ts",
 									"qualifiedName": "Query"
 								},
 								"name": "Query",
@@ -3302,7 +3115,7 @@
 			"type": {
 				"type": "reference",
 				"target": {
-					"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+					"sourceFileName": "../../../module/packages/model/src/Queries/index.ts",
 					"qualifiedName": "ModuleQuery"
 				},
 				"typeArguments": [
@@ -3317,7 +3130,7 @@
 						"extendsType": {
 							"type": "reference",
 							"target": {
-								"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+								"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Query.ts",
 								"qualifiedName": "Query"
 							},
 							"name": "Query",
@@ -3363,7 +3176,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/index.ts",
 					"line": 8,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/index.ts#L8"
 				}
 			],
 			"type": {
@@ -3384,13 +3197,13 @@
 					"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 					"line": 5,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L5"
 				},
 				{
 					"fileName": "modules/packages/witness/packages/model/src/Config.ts",
 					"line": 6,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Config.ts#L6"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Config.ts#L6"
 				}
 			],
 			"type": {
@@ -3409,13 +3222,13 @@
 					"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 					"line": 3,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L3"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L3"
 				},
 				{
 					"fileName": "modules/packages/witness/packages/model/src/Queries/Observe.ts",
 					"line": 4,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L4"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/Queries/Observe.ts#L4"
 				}
 			],
 			"type": {
@@ -3424,7 +3237,7 @@
 			}
 		},
 		{
-			"id": 127,
+			"id": 129,
 			"name": "asWitnessInstance",
 			"variant": "declaration",
 			"kind": 64,
@@ -3434,37 +3247,65 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 12,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L12"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L12"
 				}
 			],
 			"signatures": [
 				{
-					"id": 128,
+					"id": 130,
 					"name": "asWitnessInstance",
 					"variant": "signature",
 					"kind": 4096,
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 17,
+							"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+							"line": 4,
 							"character": 8
 						}
 					],
+					"typeParameter": [
+						{
+							"id": 131,
+							"name": "TObject",
+							"variant": "typeParam",
+							"kind": 131072,
+							"flags": {},
+							"type": {
+								"type": "reference",
+								"target": 86,
+								"name": "WitnessInstance",
+								"package": "@xyo-network/witness-model"
+							}
+						}
+					],
 					"parameters": [
 						{
-							"id": 129,
+							"id": 132,
 							"name": "obj",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {},
 							"type": {
-								"type": "intrinsic",
-								"name": "any"
+								"type": "union",
+								"types": [
+									{
+										"type": "intrinsic",
+										"name": "undefined"
+									},
+									{
+										"type": "literal",
+										"value": null
+									},
+									{
+										"type": "intrinsic",
+										"name": "object"
+									}
+								]
 							}
 						},
 						{
-							"id": 130,
+							"id": 133,
 							"name": "config",
 							"variant": "param",
 							"kind": 32768,
@@ -3474,11 +3315,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
@@ -3491,40 +3332,68 @@
 							},
 							{
 								"type": "reference",
-								"target": 86,
-								"name": "WitnessInstance",
-								"package": "@xyo-network/witness-model"
+								"target": -1,
+								"name": "TObject",
+								"refersToTypeParameter": true
 							}
 						]
 					}
 				},
 				{
-					"id": 131,
+					"id": 134,
 					"name": "asWitnessInstance",
 					"variant": "signature",
 					"kind": 4096,
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 18,
+							"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+							"line": 5,
 							"character": 8
 						}
 					],
+					"typeParameter": [
+						{
+							"id": 135,
+							"name": "TObject_1",
+							"variant": "typeParam",
+							"kind": 131072,
+							"flags": {},
+							"type": {
+								"type": "reference",
+								"target": 86,
+								"name": "WitnessInstance",
+								"package": "@xyo-network/witness-model"
+							}
+						}
+					],
 					"parameters": [
 						{
-							"id": 132,
+							"id": 136,
 							"name": "obj",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {},
 							"type": {
-								"type": "intrinsic",
-								"name": "any"
+								"type": "union",
+								"types": [
+									{
+										"type": "intrinsic",
+										"name": "undefined"
+									},
+									{
+										"type": "literal",
+										"value": null
+									},
+									{
+										"type": "intrinsic",
+										"name": "object"
+									}
+								]
 							}
 						},
 						{
-							"id": 133,
+							"id": 137,
 							"name": "assert",
 							"variant": "param",
 							"kind": 32768,
@@ -3539,30 +3408,30 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 134,
+											"id": 138,
 											"name": "__type",
 											"variant": "declaration",
 											"kind": 65536,
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "sdk/packages/identity/dist/index.d.ts",
-													"line": 18,
-													"character": 37
+													"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+													"line": 5,
+													"character": 80
 												}
 											],
 											"signatures": [
 												{
-													"id": 135,
+													"id": 139,
 													"name": "__type",
 													"variant": "signature",
 													"kind": 4096,
 													"flags": {},
 													"sources": [
 														{
-															"fileName": "sdk/packages/identity/dist/index.d.ts",
-															"line": 18,
-															"character": 37
+															"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+															"line": 5,
+															"character": 80
 														}
 													],
 													"type": {
@@ -3577,7 +3446,7 @@
 							}
 						},
 						{
-							"id": 136,
+							"id": 140,
 							"name": "config",
 							"variant": "param",
 							"kind": 32768,
@@ -3587,19 +3456,19 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
 					"type": {
 						"type": "reference",
-						"target": 86,
-						"name": "WitnessInstance",
-						"package": "@xyo-network/witness-model"
+						"target": -1,
+						"name": "TObject_1",
+						"refersToTypeParameter": true
 					}
 				}
 			]
@@ -3615,7 +3484,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 11,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L11"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L11"
 				}
 			],
 			"signatures": [
@@ -3627,25 +3496,53 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 17,
+							"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+							"line": 4,
 							"character": 8
 						}
 					],
-					"parameters": [
+					"typeParameter": [
 						{
 							"id": 119,
+							"name": "TObject",
+							"variant": "typeParam",
+							"kind": 131072,
+							"flags": {},
+							"type": {
+								"type": "reference",
+								"target": 91,
+								"name": "WitnessModule",
+								"package": "@xyo-network/witness-model"
+							}
+						}
+					],
+					"parameters": [
+						{
+							"id": 120,
 							"name": "obj",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {},
 							"type": {
-								"type": "intrinsic",
-								"name": "any"
+								"type": "union",
+								"types": [
+									{
+										"type": "intrinsic",
+										"name": "undefined"
+									},
+									{
+										"type": "literal",
+										"value": null
+									},
+									{
+										"type": "intrinsic",
+										"name": "object"
+									}
+								]
 							}
 						},
 						{
-							"id": 120,
+							"id": 121,
 							"name": "config",
 							"variant": "param",
 							"kind": 32768,
@@ -3655,11 +3552,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
@@ -3672,40 +3569,68 @@
 							},
 							{
 								"type": "reference",
-								"target": 91,
-								"name": "WitnessModule",
-								"package": "@xyo-network/witness-model"
+								"target": -1,
+								"name": "TObject",
+								"refersToTypeParameter": true
 							}
 						]
 					}
 				},
 				{
-					"id": 121,
+					"id": 122,
 					"name": "asWitnessModule",
 					"variant": "signature",
 					"kind": 4096,
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 18,
+							"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+							"line": 5,
 							"character": 8
 						}
 					],
+					"typeParameter": [
+						{
+							"id": 123,
+							"name": "TObject_1",
+							"variant": "typeParam",
+							"kind": 131072,
+							"flags": {},
+							"type": {
+								"type": "reference",
+								"target": 91,
+								"name": "WitnessModule",
+								"package": "@xyo-network/witness-model"
+							}
+						}
+					],
 					"parameters": [
 						{
-							"id": 122,
+							"id": 124,
 							"name": "obj",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {},
 							"type": {
-								"type": "intrinsic",
-								"name": "any"
+								"type": "union",
+								"types": [
+									{
+										"type": "intrinsic",
+										"name": "undefined"
+									},
+									{
+										"type": "literal",
+										"value": null
+									},
+									{
+										"type": "intrinsic",
+										"name": "object"
+									}
+								]
 							}
 						},
 						{
-							"id": 123,
+							"id": 125,
 							"name": "assert",
 							"variant": "param",
 							"kind": 32768,
@@ -3720,30 +3645,30 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 124,
+											"id": 126,
 											"name": "__type",
 											"variant": "declaration",
 											"kind": 65536,
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "sdk/packages/identity/dist/index.d.ts",
-													"line": 18,
-													"character": 37
+													"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+													"line": 5,
+													"character": 80
 												}
 											],
 											"signatures": [
 												{
-													"id": 125,
+													"id": 127,
 													"name": "__type",
 													"variant": "signature",
 													"kind": 4096,
 													"flags": {},
 													"sources": [
 														{
-															"fileName": "sdk/packages/identity/dist/index.d.ts",
-															"line": 18,
-															"character": 37
+															"fileName": "protocol/packages/core/packages/object/dist/AsObjectFactory.d.ts",
+															"line": 5,
+															"character": 80
 														}
 													],
 													"type": {
@@ -3758,7 +3683,7 @@
 							}
 						},
 						{
-							"id": 126,
+							"id": 128,
 							"name": "config",
 							"variant": "param",
 							"kind": 32768,
@@ -3768,19 +3693,19 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
 					"type": {
 						"type": "reference",
-						"target": 91,
-						"name": "WitnessModule",
-						"package": "@xyo-network/witness-model"
+						"target": -1,
+						"name": "TObject_1",
+						"refersToTypeParameter": true
 					}
 				}
 			]
@@ -3796,7 +3721,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 8,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L8"
 				}
 			],
 			"signatures": [
@@ -3808,9 +3733,9 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 10,
-							"character": 42
+							"fileName": "protocol/packages/core/packages/object/dist/IsObjectFactory.d.ts",
+							"line": 6,
+							"character": 49
 						}
 					],
 					"parameters": [
@@ -3836,11 +3761,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
@@ -3869,7 +3794,7 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 9,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L9"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L9"
 				}
 			],
 			"signatures": [
@@ -3881,9 +3806,9 @@
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "sdk/packages/identity/dist/index.d.ts",
-							"line": 10,
-							"character": 42
+							"fileName": "protocol/packages/core/packages/object/dist/IsObjectFactory.d.ts",
+							"line": 6,
+							"character": 49
 						}
 					],
 					"parameters": [
@@ -3909,11 +3834,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+									"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 									"qualifiedName": "ObjectTypeConfig"
 								},
 								"name": "ObjectTypeConfig",
-								"package": "@xyo-network/object-identity"
+								"package": "@xyo-network/object"
 							}
 						}
 					],
@@ -3932,7 +3857,7 @@
 			]
 		},
 		{
-			"id": 145,
+			"id": 149,
 			"name": "withWitnessInstance",
 			"variant": "declaration",
 			"kind": 64,
@@ -3942,26 +3867,26 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 14,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L14"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L14"
 				}
 			],
 			"signatures": [
 				{
-					"id": 146,
+					"id": 150,
 					"name": "withWitnessInstance",
 					"variant": "signature",
 					"kind": 4096,
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-							"line": 325,
+							"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+							"line": 3,
 							"character": 65
 						}
 					],
 					"typeParameter": [
 						{
-							"id": 147,
+							"id": 151,
 							"name": "R",
 							"variant": "typeParam",
 							"kind": 131072,
@@ -3970,7 +3895,7 @@
 					],
 					"parameters": [
 						{
-							"id": 148,
+							"id": 152,
 							"name": "module",
 							"variant": "param",
 							"kind": 32768,
@@ -3981,7 +3906,7 @@
 							}
 						},
 						{
-							"id": 149,
+							"id": 153,
 							"name": "closure",
 							"variant": "param",
 							"kind": 32768,
@@ -3989,35 +3914,35 @@
 							"type": {
 								"type": "reflection",
 								"declaration": {
-									"id": 150,
+									"id": 154,
 									"name": "__type",
 									"variant": "declaration",
 									"kind": 65536,
 									"flags": {},
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 325,
+											"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+											"line": 3,
 											"character": 91
 										}
 									],
 									"signatures": [
 										{
-											"id": 151,
+											"id": 155,
 											"name": "__type",
 											"variant": "signature",
 											"kind": 4096,
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 325,
+													"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+													"line": 3,
 													"character": 91
 												}
 											],
 											"parameters": [
 												{
-													"id": 152,
+													"id": 156,
 													"name": "module",
 													"variant": "param",
 													"kind": 32768,
@@ -4061,7 +3986,7 @@
 			]
 		},
 		{
-			"id": 137,
+			"id": 141,
 			"name": "withWitnessModule",
 			"variant": "declaration",
 			"kind": 64,
@@ -4071,26 +3996,26 @@
 					"fileName": "modules/packages/witness/packages/model/src/typeChecks.ts",
 					"line": 13,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/899ce501d2fd1/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L13"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/01bbe3eabe49d/packages/modules/packages/witness/packages/model/src/typeChecks.ts#L13"
 				}
 			],
 			"signatures": [
 				{
-					"id": 138,
+					"id": 142,
 					"name": "withWitnessModule",
 					"variant": "signature",
 					"kind": 4096,
 					"flags": {},
 					"sources": [
 						{
-							"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-							"line": 325,
+							"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+							"line": 3,
 							"character": 65
 						}
 					],
 					"typeParameter": [
 						{
-							"id": 139,
+							"id": 143,
 							"name": "R",
 							"variant": "typeParam",
 							"kind": 131072,
@@ -4099,7 +4024,7 @@
 					],
 					"parameters": [
 						{
-							"id": 140,
+							"id": 144,
 							"name": "module",
 							"variant": "param",
 							"kind": 32768,
@@ -4110,7 +4035,7 @@
 							}
 						},
 						{
-							"id": 141,
+							"id": 145,
 							"name": "closure",
 							"variant": "param",
 							"kind": 32768,
@@ -4118,35 +4043,35 @@
 							"type": {
 								"type": "reflection",
 								"declaration": {
-									"id": 142,
+									"id": 146,
 									"name": "__type",
 									"variant": "declaration",
 									"kind": 65536,
 									"flags": {},
 									"sources": [
 										{
-											"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-											"line": 325,
+											"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+											"line": 3,
 											"character": 91
 										}
 									],
 									"signatures": [
 										{
-											"id": 143,
+											"id": 147,
 											"name": "__type",
 											"variant": "signature",
 											"kind": 4096,
 											"flags": {},
 											"sources": [
 												{
-													"fileName": "modules/packages/module/packages/model/dist/index.d.ts",
-													"line": 325,
+													"fileName": "modules/packages/module/packages/model/dist/withModule.d.ts",
+													"line": 3,
 													"character": 91
 												}
 											],
 											"parameters": [
 												{
-													"id": 144,
+													"id": 148,
 													"name": "module",
 													"variant": "param",
 													"kind": 32768,
@@ -4196,7 +4121,7 @@
 			"children": [
 				60,
 				77,
-				153,
+				157,
 				9
 			]
 		},
@@ -4229,12 +4154,12 @@
 		{
 			"title": "Functions",
 			"children": [
-				127,
+				129,
 				117,
 				109,
 				113,
-				145,
-				137
+				149,
+				141
 			]
 		}
 	],
@@ -4287,175 +4212,175 @@
 			"qualifiedName": "WitnessModuleEventData"
 		},
 		"10": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "ObserveEndEventData.observeEnd"
 		},
 		"11": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"12": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"13": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type"
 		},
 		"14": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.errors"
 		},
 		"15": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"16": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"17": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"18": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.outPayloads"
 		},
 		"19": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"20": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"21": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "ObserveStartEventData.observeStart"
 		},
 		"22": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"23": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"24": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type"
 		},
 		"25": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"26": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"27": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"28": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleQueried.ts",
 			"qualifiedName": "ModuleQueriedEventData.moduleQueried"
 		},
 		"29": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"30": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"31": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleQueried.ts",
 			"qualifiedName": "__type"
 		},
 		"32": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleQueried.ts",
 			"qualifiedName": "__type.payloads"
 		},
 		"33": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"34": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"35": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleQueried.ts",
 			"qualifiedName": "__type.query"
 		},
 		"36": {
-			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/src/Query/QueryBoundWitness.ts",
 			"qualifiedName": "__type"
 		},
 		"37": {
-			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/src/Query/QueryBoundWitness.ts",
 			"qualifiedName": "__type.query"
 		},
 		"38": {
-			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/src/Query/QueryBoundWitness.ts",
 			"qualifiedName": "__type.resultSet"
 		},
 		"39": {
-			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/boundwitness/packages/builder/src/Query/QueryBoundWitness.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"40": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"41": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"42": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleQueried.ts",
 			"qualifiedName": "__type.result"
 		},
 		"43": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleBusy.ts",
 			"qualifiedName": "ModuleBusyEventData.moduleBusy"
 		},
 		"44": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"45": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"46": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleBusy.ts",
 			"qualifiedName": "__type"
 		},
 		"47": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleBusy.ts",
 			"qualifiedName": "__type.busy"
 		},
 		"48": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleError.ts",
 			"qualifiedName": "ModuleErrorEventData.moduleError"
 		},
 		"49": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"50": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"51": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleError.ts",
 			"qualifiedName": "__type"
 		},
 		"52": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleError.ts",
 			"qualifiedName": "__type.error"
 		},
 		"53": {
@@ -4463,131 +4388,131 @@
 			"qualifiedName": "WitnessModuleEventData.T"
 		},
 		"54": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "ObserveEndEventArgs"
 		},
 		"55": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type"
 		},
 		"56": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.errors"
 		},
 		"57": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"58": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.outPayloads"
 		},
 		"59": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "T"
 		},
 		"60": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "ObserveEndEventData"
 		},
 		"61": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "ObserveEndEventData.observeEnd"
 		},
 		"62": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"63": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"64": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type"
 		},
 		"65": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.errors"
 		},
 		"66": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"67": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"68": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"69": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "__type.outPayloads"
 		},
 		"70": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"71": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"72": {
-			"sourceFileName": "src/Events/ObserveEnd.ts",
+			"sourceFileName": "src/EventsModels/ObserveEnd.ts",
 			"qualifiedName": "ObserveEndEventData.T"
 		},
 		"73": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "ObserveStartEventArgs"
 		},
 		"74": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type"
 		},
 		"75": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"76": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "T"
 		},
 		"77": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "ObserveStartEventData"
 		},
 		"78": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "ObserveStartEventData.observeStart"
 		},
 		"79": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type"
 		},
 		"80": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/EventsModels/ModuleEventArgs.ts",
 			"qualifiedName": "__type.module"
 		},
 		"81": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type"
 		},
 		"82": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "__type.inPayloads"
 		},
 		"83": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
 		"84": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
 		"85": {
-			"sourceFileName": "src/Events/ObserveStart.ts",
+			"sourceFileName": "src/EventsModels/ObserveStart.ts",
 			"qualifiedName": "ObserveStartEventData.T"
 		},
 		"86": {
@@ -4687,15 +4612,15 @@
 			"qualifiedName": "isWitnessInstance"
 		},
 		"110": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "isWitnessInstance"
 		},
 		"111": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "obj"
 		},
 		"112": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "config"
 		},
 		"113": {
@@ -4703,15 +4628,15 @@
 			"qualifiedName": "isWitnessModule"
 		},
 		"114": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "isWitnessModule"
 		},
 		"115": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "obj"
 		},
 		"116": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/IsObjectFactory.ts",
 			"qualifiedName": "config"
 		},
 		"117": {
@@ -4719,179 +4644,195 @@
 			"qualifiedName": "asWitnessModule"
 		},
 		"118": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
 			"qualifiedName": "asWitnessModule"
 		},
 		"119": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "obj"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "TObject"
 		},
 		"120": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "config"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "obj"
 		},
 		"121": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "asWitnessModule"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "config"
 		},
 		"122": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "obj"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "asWitnessModule"
 		},
 		"123": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "assert"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "TObject_1"
 		},
 		"124": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "obj"
 		},
 		"125": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "assert"
 		},
 		"126": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "config"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "__type"
 		},
 		"127": {
-			"sourceFileName": "src/typeChecks.ts",
-			"qualifiedName": "asWitnessInstance"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "__type"
 		},
 		"128": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "asWitnessInstance"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "config"
 		},
 		"129": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "obj"
+			"sourceFileName": "src/typeChecks.ts",
+			"qualifiedName": "asWitnessInstance"
 		},
 		"130": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "config"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "asWitnessInstance"
 		},
 		"131": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "asWitnessInstance"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "TObject"
 		},
 		"132": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
 			"qualifiedName": "obj"
 		},
 		"133": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "assert"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "config"
 		},
 		"134": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "asWitnessInstance"
 		},
 		"135": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "TObject_1"
 		},
 		"136": {
-			"sourceFileName": "../../../../../sdk/packages/identity/dist/index.d.ts",
-			"qualifiedName": "config"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "obj"
 		},
 		"137": {
-			"sourceFileName": "src/typeChecks.ts",
-			"qualifiedName": "withWitnessModule"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "assert"
 		},
 		"138": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "withWitnessModule"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "__type"
 		},
 		"139": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "R"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "__type"
 		},
 		"140": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "module"
+			"sourceFileName": "../../../../../protocol/packages/core/packages/object/src/AsObjectFactory.ts",
+			"qualifiedName": "config"
 		},
 		"141": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "closure"
+			"sourceFileName": "src/typeChecks.ts",
+			"qualifiedName": "withWitnessModule"
 		},
 		"142": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "withWitnessModule"
 		},
 		"143": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "R"
 		},
 		"144": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
 			"qualifiedName": "module"
 		},
 		"145": {
-			"sourceFileName": "src/typeChecks.ts",
-			"qualifiedName": "withWitnessInstance"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "closure"
 		},
 		"146": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "withWitnessInstance"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "__type"
 		},
 		"147": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "R"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "__type"
 		},
 		"148": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
 			"qualifiedName": "module"
 		},
 		"149": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "closure"
+			"sourceFileName": "src/typeChecks.ts",
+			"qualifiedName": "withWitnessInstance"
 		},
 		"150": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "withWitnessInstance"
 		},
 		"151": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
-			"qualifiedName": "__type"
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "R"
 		},
 		"152": {
-			"sourceFileName": "../../../module/packages/model/dist/index.d.ts",
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
 			"qualifiedName": "module"
 		},
 		"153": {
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "closure"
+		},
+		"154": {
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "__type"
+		},
+		"155": {
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "__type"
+		},
+		"156": {
+			"sourceFileName": "../../../module/packages/model/src/withModule.ts",
+			"qualifiedName": "module"
+		},
+		"157": {
 			"sourceFileName": "src/Witness.ts",
 			"qualifiedName": "Witness"
 		},
-		"154": {
+		"158": {
 			"sourceFileName": "src/Witness.ts",
 			"qualifiedName": "Witness.observe"
 		},
-		"155": {
+		"159": {
 			"sourceFileName": "src/Witness.ts",
 			"qualifiedName": "__type"
 		},
-		"156": {
+		"160": {
 			"sourceFileName": "src/Witness.ts",
 			"qualifiedName": "__type"
 		},
-		"157": {
+		"161": {
 			"sourceFileName": "src/Witness.ts",
 			"qualifiedName": "payloads"
 		},
-		"158": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+		"162": {
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
-		"159": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+		"163": {
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		},
-		"160": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+		"164": {
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type"
 		},
-		"161": {
-			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/dist/index.d.ts",
+		"165": {
+			"sourceFileName": "../../../../../protocol/packages/payload/packages/model/src/Payload.ts",
 			"qualifiedName": "__type.schema"
 		}
 	}