diff --git a/contracts/core-contracts/cw-asset-manager/schema/cw-asset-manager.json b/contracts/core-contracts/cw-asset-manager/schema/cw-asset-manager.json
index a4199ce..466e4ff 100644
--- a/contracts/core-contracts/cw-asset-manager/schema/cw-asset-manager.json
+++ b/contracts/core-contracts/cw-asset-manager/schema/cw-asset-manager.json
@@ -7,14 +7,15 @@
     "title": "InstantiateMsg",
     "type": "object",
     "required": [
-      "cw20_whitelist"
+      "destination_asset_manager",
+      "source_xcall"
     ],
     "properties": {
-      "cw20_whitelist": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
+      "destination_asset_manager": {
+        "type": "string"
+      },
+      "source_xcall": {
+        "type": "string"
       }
     },
     "additionalProperties": false
@@ -39,30 +40,22 @@
               "amount": {
                 "$ref": "#/definitions/Uint128"
               },
-              "token_address": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "withdraw_request"
-        ],
-        "properties": {
-          "withdraw_request": {
-            "type": "object",
-            "required": [
-              "amount",
-              "token_address"
-            ],
-            "properties": {
-              "amount": {
-                "$ref": "#/definitions/Uint128"
+              "data": {
+                "type": [
+                  "array",
+                  "null"
+                ],
+                "items": {
+                  "type": "integer",
+                  "format": "uint8",
+                  "minimum": 0.0
+                }
+              },
+              "to": {
+                "type": [
+                  "string",
+                  "null"
+                ]
               },
               "token_address": {
                 "type": "string"
@@ -82,11 +75,11 @@
           "configure_xcall": {
             "type": "object",
             "required": [
-              "destination_contract",
+              "destination_asset_manager",
               "source_xcall"
             ],
             "properties": {
-              "destination_contract": {
+              "destination_asset_manager": {
                 "type": "string"
               },
               "source_xcall": {
@@ -139,10 +132,112 @@
   "query": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "QueryMsg",
-    "type": "string",
-    "enum": []
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "get_owner"
+        ],
+        "properties": {
+          "get_owner": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_configuration"
+        ],
+        "properties": {
+          "get_configuration": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_net_ids"
+        ],
+        "properties": {
+          "get_net_ids": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
   },
   "migrate": null,
   "sudo": null,
-  "responses": {}
+  "responses": {
+    "get_configuration": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ConfigureResponse",
+      "type": "object",
+      "required": [
+        "icon_asset_manager",
+        "source_xcall"
+      ],
+      "properties": {
+        "icon_asset_manager": {
+          "type": "string"
+        },
+        "source_xcall": {
+          "$ref": "#/definitions/Addr"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
+      }
+    },
+    "get_net_ids": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NetIdResponse",
+      "type": "object",
+      "required": [
+        "icon_nid",
+        "x_call_nid"
+      ],
+      "properties": {
+        "icon_nid": {
+          "type": "string"
+        },
+        "x_call_nid": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "get_owner": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OwnerResponse",
+      "type": "object",
+      "required": [
+        "owner"
+      ],
+      "properties": {
+        "owner": {
+          "$ref": "#/definitions/Addr"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
+      }
+    }
+  }
 }
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/execute.json b/contracts/core-contracts/cw-asset-manager/schema/raw/execute.json
index 4fca32a..09d10a4 100644
--- a/contracts/core-contracts/cw-asset-manager/schema/raw/execute.json
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/execute.json
@@ -18,30 +18,22 @@
             "amount": {
               "$ref": "#/definitions/Uint128"
             },
-            "token_address": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "withdraw_request"
-      ],
-      "properties": {
-        "withdraw_request": {
-          "type": "object",
-          "required": [
-            "amount",
-            "token_address"
-          ],
-          "properties": {
-            "amount": {
-              "$ref": "#/definitions/Uint128"
+            "data": {
+              "type": [
+                "array",
+                "null"
+              ],
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "to": {
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "token_address": {
               "type": "string"
@@ -61,11 +53,11 @@
         "configure_xcall": {
           "type": "object",
           "required": [
-            "destination_contract",
+            "destination_asset_manager",
             "source_xcall"
           ],
           "properties": {
-            "destination_contract": {
+            "destination_asset_manager": {
               "type": "string"
             },
             "source_xcall": {
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/instantiate.json b/contracts/core-contracts/cw-asset-manager/schema/raw/instantiate.json
index e478e70..1e39bc1 100644
--- a/contracts/core-contracts/cw-asset-manager/schema/raw/instantiate.json
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/instantiate.json
@@ -3,14 +3,15 @@
   "title": "InstantiateMsg",
   "type": "object",
   "required": [
-    "cw20_whitelist"
+    "destination_asset_manager",
+    "source_xcall"
   ],
   "properties": {
-    "cw20_whitelist": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
+    "destination_asset_manager": {
+      "type": "string"
+    },
+    "source_xcall": {
+      "type": "string"
     }
   },
   "additionalProperties": false
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/query.json b/contracts/core-contracts/cw-asset-manager/schema/raw/query.json
index 0f592a1..944a2b4 100644
--- a/contracts/core-contracts/cw-asset-manager/schema/raw/query.json
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/query.json
@@ -1,6 +1,45 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "QueryMsg",
-  "type": "string",
-  "enum": []
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "get_owner"
+      ],
+      "properties": {
+        "get_owner": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_configuration"
+      ],
+      "properties": {
+        "get_configuration": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_net_ids"
+      ],
+      "properties": {
+        "get_net_ids": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
 }
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_configuration.json b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_configuration.json
new file mode 100644
index 0000000..fabbece
--- /dev/null
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_configuration.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ConfigureResponse",
+  "type": "object",
+  "required": [
+    "icon_asset_manager",
+    "source_xcall"
+  ],
+  "properties": {
+    "icon_asset_manager": {
+      "type": "string"
+    },
+    "source_xcall": {
+      "$ref": "#/definitions/Addr"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    }
+  }
+}
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_net_ids.json b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_net_ids.json
new file mode 100644
index 0000000..2f0abe9
--- /dev/null
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_net_ids.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "NetIdResponse",
+  "type": "object",
+  "required": [
+    "icon_nid",
+    "x_call_nid"
+  ],
+  "properties": {
+    "icon_nid": {
+      "type": "string"
+    },
+    "x_call_nid": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_owner.json b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_owner.json
new file mode 100644
index 0000000..4a80686
--- /dev/null
+++ b/contracts/core-contracts/cw-asset-manager/schema/raw/response_to_get_owner.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "OwnerResponse",
+  "type": "object",
+  "required": [
+    "owner"
+  ],
+  "properties": {
+    "owner": {
+      "$ref": "#/definitions/Addr"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    }
+  }
+}