diff --git a/definitions/rest/data_type/rest_adapter_input.proto.json b/definitions/rest/data_type/rest_adapter_input.proto.json
index 9397522..5b6a94c 100644
--- a/definitions/rest/data_type/rest_adapter_input.proto.json
+++ b/definitions/rest/data_type/rest_adapter_input.proto.json
@@ -1,48 +1,56 @@
 {
-  "variant": "OBJECT",
-  "identifier": "REST_ADAPTER_INPUT",
-  "name": [
-    {
-      "code": "en-US",
-      "content": "Rest Adapter Input"
-    }
-  ],
-  "alias": [
-    {
-      "code": "en-US",
-      "content": "http;rest;adapter;input"
-    }
-  ],
-  "displayMessage": [
-    {
-      "code": "en-US",
-      "content": "Rest Adapter Input"
-    }
-  ],
-  "rules": [
-    {
-      "containsKey": {
-        "key": "body",
-        "dataTypeIdentifier": {
-          "dataTypeIdentifier": "OBJECT"
-        }
-      }
-    },
-    {
-      "containsKey": {
-        "key": "headers",
-        "dataTypeIdentifier": {
-          "dataTypeIdentifier": "REST_HEADER_INPUT"
-        }
-      }
-    },
-    {
-      "parentType": {
-        "parentType": {
-          "dataTypeIdentifier": "OBJECT"
-        }
-      }
-    }
-  ],
-  "genericKeys": []
+	"variant": "OBJECT",
+	"identifier": "REST_ADAPTER_INPUT",
+	"name": [
+		{
+			"code": "en-US",
+			"content": "Rest Adapter Input"
+		}
+	],
+	"alias": [
+		{
+			"code": "en-US",
+			"content": "http;rest;adapter;input"
+		}
+	],
+	"displayMessage": [
+		{
+			"code": "en-US",
+			"content": "Rest Adapter Input"
+		}
+	],
+	"rules": [
+		{
+			"containsKey": {
+				"key": "body",
+				"dataTypeIdentifier": {
+					"genericType": {
+						"dataTypeIdentifier": "OBJECT",
+						"genericMappers": [
+							{
+								"source": [
+									{
+										"genericKey": "O"
+									}
+								],
+								"target": "T",
+								"genericCombinations": []
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"containsKey": {
+				"key": "headers",
+				"dataTypeIdentifier": {
+					"dataTypeIdentifier": "REST_HEADER_INPUT"
+				}
+			}
+		}
+	],
+	"genericKeys": [
+		"O"
+	]
 }
diff --git a/definitions/standard/data_type/object/http_header_entry.proto.json b/definitions/standard/data_type/object/http_header_entry.proto.json
index 1bb6fe7..2137522 100644
--- a/definitions/standard/data_type/object/http_header_entry.proto.json
+++ b/definitions/standard/data_type/object/http_header_entry.proto.json
@@ -35,13 +35,6 @@
 					"dataTypeIdentifier": "TEXT"
 				}
 			}
-		},
-		{
-			"parentType": {
-				"parentType": {
-					"dataTypeIdentifier": "OBJECT"
-				}
-			}
 		}
 	],
 	"genericKeys": []
diff --git a/definitions/standard/data_type/object/http_request.proto.json b/definitions/standard/data_type/object/http_request.proto.json
index f0d0f82..8e2d6e4 100644
--- a/definitions/standard/data_type/object/http_request.proto.json
+++ b/definitions/standard/data_type/object/http_request.proto.json
@@ -40,7 +40,20 @@
 			"containsKey": {
 				"key": "body",
 				"dataTypeIdentifier": {
-					"dataTypeIdentifier": "OBJECT"
+					"genericType": {
+						"dataTypeIdentifier": "OBJECT",
+						"genericMappers": [
+							{
+								"source": [
+									{
+										"genericKey": "O"
+									}
+								],
+								"target": "T",
+								"genericCombinations": []
+							}
+						]
+					}
 				}
 			}
 		},
@@ -51,14 +64,7 @@
 					"dataTypeIdentifier": "HTTP_HEADER_MAP"
 				}
 			}
-		},
-		{
-			"parentType": {
-				"parentType": {
-					"dataTypeIdentifier": "OBJECT"
-				}
-			}
 		}
 	],
-	"genericKeys": []
+	"genericKeys": ["O"]
 }
diff --git a/definitions/standard/data_type/object/http_response.proto.json b/definitions/standard/data_type/object/http_response.proto.json
index 21a695b..b40cb11 100644
--- a/definitions/standard/data_type/object/http_response.proto.json
+++ b/definitions/standard/data_type/object/http_response.proto.json
@@ -32,17 +32,25 @@
 			"containsKey": {
 				"key": "body",
 				"dataTypeIdentifier": {
-					"dataTypeIdentifier": "OBJECT"
-				}
-			}
-		},
-		{
-			"parentType": {
-				"parentType": {
-					"dataTypeIdentifier": "OBJECT"
+					"genericType": {
+						"dataTypeIdentifier": "OBJECT",
+						"genericMappers": [
+							{
+								"source": [
+									{
+										"genericKey": "O"
+									}
+								],
+								"target": "T",
+								"genericCombinations": []
+							}
+						]
+					}
 				}
 			}
 		}
 	],
-	"genericKeys": []
+	"genericKeys": [
+		"O"
+	]
 }
diff --git a/definitions/standard/data_type/object/object.proto.json b/definitions/standard/data_type/object/object.proto.json
index 7516727..6fffa62 100644
--- a/definitions/standard/data_type/object/object.proto.json
+++ b/definitions/standard/data_type/object/object.proto.json
@@ -19,6 +19,16 @@
 			"content": "Object"
 		}
 	],
-	"rules": [],
-	"genericKeys": []
+	"rules": [
+		{
+			"parentType": {
+				"parentType": {
+					"genericKey": "T"
+				}
+			}
+		}
+	],
+	"genericKeys": [
+		"T"
+	]
 }
diff --git a/definitions/standard/runtime_definition/object/std_object_contains_key.proto.json b/definitions/standard/runtime_definition/object/std_object_contains_key.proto.json
index 35a83bc..7d47719 100644
--- a/definitions/standard/runtime_definition/object/std_object_contains_key.proto.json
+++ b/definitions/standard/runtime_definition/object/std_object_contains_key.proto.json
@@ -3,7 +3,20 @@
 	"runtimeParameterDefinitions": [
 		{
 			"dataTypeIdentifier": {
-				"dataTypeIdentifier": "OBJECT"
+				"genericType": {
+					"dataTypeIdentifier": "OBJECT",
+					"genericMappers": [
+						{
+							"source": [
+								{
+									"genericKey": "O"
+								}
+							],
+							"target": "T",
+							"genericCombinations": []
+						}
+					]
+				}
 			},
 			"runtimeName": "object",
 			"defaultValue": null,
@@ -46,7 +59,9 @@
 		"dataTypeIdentifier": "BOOLEAN"
 	},
 	"throwsError": false,
-	"genericKeys": [],
+	"genericKeys": [
+		"O"
+	],
 	"name": [
 		{
 			"code": "en-US",
diff --git a/definitions/standard/runtime_definition/object/std_object_keys.proto.json b/definitions/standard/runtime_definition/object/std_object_keys.proto.json
index f91b40e..114843e 100644
--- a/definitions/standard/runtime_definition/object/std_object_keys.proto.json
+++ b/definitions/standard/runtime_definition/object/std_object_keys.proto.json
@@ -3,7 +3,20 @@
 	"runtimeParameterDefinitions": [
 		{
 			"dataTypeIdentifier": {
-				"dataTypeIdentifier": "OBJECT"
+				"genericType": {
+					"dataTypeIdentifier": "OBJECT",
+					"genericMappers": [
+						{
+							"source": [
+								{
+									"genericKey": "O"
+								}
+							],
+							"target": "T",
+							"genericCombinations": []
+						}
+					]
+				}
 			},
 			"runtimeName": "object",
 			"defaultValue": null,
@@ -39,7 +52,7 @@
 		}
 	},
 	"throwsError": false,
-	"genericKeys": [],
+	"genericKeys": ["O"],
 	"name": [
 		{
 			"code": "en-US",
diff --git a/definitions/standard/runtime_definition/object/std_object_set.proto.json b/definitions/standard/runtime_definition/object/std_object_set.proto.json
index 8aa60e1..f58ddc8 100644
--- a/definitions/standard/runtime_definition/object/std_object_set.proto.json
+++ b/definitions/standard/runtime_definition/object/std_object_set.proto.json
@@ -3,7 +3,20 @@
 	"runtimeParameterDefinitions": [
 		{
 			"dataTypeIdentifier": {
-				"dataTypeIdentifier": "OBJECT"
+				"genericType": {
+					"dataTypeIdentifier": "OBJECT",
+					"genericMappers": [
+						{
+							"source": [
+								{
+									"genericKey": "O"
+								}
+							],
+							"target": "T",
+							"genericCombinations": []
+						}
+					]
+				}
 			},
 			"runtimeName": "object",
 			"defaultValue": null,
@@ -67,7 +80,8 @@
 	},
 	"throwsError": false,
 	"genericKeys": [
-		"I"
+		"I",
+		"O"
 	],
 	"name": [
 		{
diff --git a/definitions/standard/runtime_definition/object/std_object_size.proto.json b/definitions/standard/runtime_definition/object/std_object_size.proto.json
index 436d123..f3e49d0 100644
--- a/definitions/standard/runtime_definition/object/std_object_size.proto.json
+++ b/definitions/standard/runtime_definition/object/std_object_size.proto.json
@@ -3,7 +3,20 @@
 	"runtimeParameterDefinitions": [
 		{
 			"dataTypeIdentifier": {
-				"dataTypeIdentifier": "OBJECT"
+				"genericType": {
+					"dataTypeIdentifier": "OBJECT",
+					"genericMappers": [
+						{
+							"source": [
+								{
+									"genericKey": "O"
+								}
+							],
+							"target": "T",
+							"genericCombinations": []
+						}
+					]
+				}
 			},
 			"runtimeName": "object",
 			"defaultValue": null,
@@ -26,7 +39,7 @@
 		"dataTypeIdentifier": "NUMBER"
 	},
 	"throwsError": false,
-	"genericKeys": [],
+	"genericKeys": ["O"],
 	"name": [
 		{
 			"code": "en-US",