diff --git a/.gitignore b/.gitignore
index d4a20833..1d9bc514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
 node_modules
 .nyc_output
 .vscode
-coverage
\ No newline at end of file
+coverage
+
+.DS_Store
+/test/.DS_Store
+/examples/.DS_Store
+/bindings/.DS_Store
+/.git/.DS_Store
+/definitions/.DS_Store
\ No newline at end of file
diff --git a/schemas/3.0.0-without-$id.json b/schemas/3.0.0-without-$id.json
index 87306fe9..2c69576d 100644
--- a/schemas/3.0.0-without-$id.json
+++ b/schemas/3.0.0-without-$id.json
@@ -2005,7 +2005,7 @@
                 "properties": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/bindings-jms-0.0.1-server"
+                        "$ref": "#/definitions/bindings-jms-0.0.1-server/definitions/property"
                     },
                     "description": "Additional properties to set on the JMS ConnectionFactory implementation for the JMS Provider."
                 },
@@ -2702,7 +2702,7 @@
                         "description": "Definition of the message payload. It can be of any type but defaults to Schema Object. It MUST match the schema format defined in schemaFormat, including the encoding type. E.g., Avro should be inlined as either a YAML or JSON object instead of as a string to be parsed as YAML or JSON. Non-JSON-based schemas (e.g., Protobuf or XSD) MUST be inlined as a string."
                     }
                 },
-                "allOf": [
+                "anyOf": [
                     {
                         "if": {
                             "not": {
@@ -5472,10 +5472,10 @@
                     "description": "The name of the topic. Can be different from the channel name to allow flexibility around AWS resource naming limitations."
                 },
                 "ordering": {
-                    "$ref": "#/definitions/bindings-sns-0.1.0-channel"
+                    "$ref": "#/definitions/bindings-sns-0.1.0-channel/definitions/ordering"
                 },
                 "policy": {
-                    "$ref": "#/definitions/bindings-sns-0.1.0-channel"
+                    "$ref": "#/definitions/bindings-sns-0.1.0-channel/definitions/policy"
                 },
                 "tags": {
                     "type": "object",
@@ -5530,7 +5530,7 @@
                             "type": "array",
                             "description": "An array of statement objects, each of which controls a permission for this topic",
                             "items": {
-                                "$ref": "#/definitions/bindings-sns-0.1.0-channel"
+                                "$ref": "#/definitions/bindings-sns-0.1.0-channel/definitions/statement"
                             }
                         }
                     },
@@ -5617,11 +5617,11 @@
             "properties": {
                 "queue": {
                     "description": "A definition of the queue that will be used as the channel.",
-                    "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                    "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/queue"
                 },
                 "deadLetterQueue": {
                     "description": "A definition of the queue that will be used for un-processable messages.",
-                    "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                    "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/queue"
                 },
                 "bindingVersion": {
                     "type": "string",
@@ -5700,10 +5700,10 @@
                             "default": 345600
                         },
                         "redrivePolicy": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/redrivePolicy"
                         },
                         "policy": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/policy"
                         },
                         "tags": {
                             "type": "object",
@@ -5725,7 +5725,7 @@
                     },
                     "properties": {
                         "deadLetterQueue": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/identifier"
                         },
                         "maxReceiveCount": {
                             "type": "integer",
@@ -5769,7 +5769,7 @@
                             "type": "array",
                             "description": "An array of statement objects, each of which controls a permission for this queue.",
                             "items": {
-                                "$ref": "#/definitions/bindings-sqs-0.2.0-channel"
+                                "$ref": "#/definitions/bindings-sqs-0.2.0-channel/definitions/statement"
                             }
                         }
                     },
@@ -7330,19 +7330,19 @@
             },
             "properties": {
                 "topic": {
-                    "$ref": "#/definitions/bindings-sns-0.1.0-operation",
+                    "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/identifier",
                     "description": "Often we can assume that the SNS Topic is the channel name-we provide this field in case the you need to supply the ARN, or the Topic name is not the channel name in the AsyncAPI document."
                 },
                 "consumers": {
                     "type": "array",
                     "description": "The protocols that listen to this topic and their endpoints.",
                     "items": {
-                        "$ref": "#/definitions/bindings-sns-0.1.0-operation"
+                        "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/consumer"
                     },
                     "minItems": 1
                 },
                 "deliveryPolicy": {
-                    "$ref": "#/definitions/bindings-sns-0.1.0-operation",
+                    "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/deliveryPolicy",
                     "description": "Policy for retries to HTTP. The field is the default for HTTP receivers of the SNS Topic which may be overridden by a specific consumer."
                 },
                 "bindingVersion": {
@@ -7410,7 +7410,7 @@
                         },
                         "endpoint": {
                             "description": "The endpoint messages are delivered to.",
-                            "$ref": "#/definitions/bindings-sns-0.1.0-operation"
+                            "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/identifier"
                         },
                         "filterPolicy": {
                             "type": "object",
@@ -7451,10 +7451,10 @@
                             "description": "If true AWS SNS attributes are removed from the body, and for SQS, SNS message attributes are copied to SQS message attributes. If false the SNS attributes are included in the body."
                         },
                         "redrivePolicy": {
-                            "$ref": "#/definitions/bindings-sns-0.1.0-operation"
+                            "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/redrivePolicy"
                         },
                         "deliveryPolicy": {
-                            "$ref": "#/definitions/bindings-sns-0.1.0-operation",
+                            "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/deliveryPolicy",
                             "description": "Policy for retries to HTTP. The parameter is for that SNS Subscription and overrides any policy on the SNS Topic."
                         },
                         "displayName": {
@@ -7526,7 +7526,7 @@
                     },
                     "properties": {
                         "deadLetterQueue": {
-                            "$ref": "#/definitions/bindings-sns-0.1.0-operation",
+                            "$ref": "#/definitions/bindings-sns-0.1.0-operation/definitions/identifier",
                             "description": "The SQS queue to use as a dead letter queue (DLQ)."
                         },
                         "maxReceiveCount": {
@@ -7604,7 +7604,7 @@
                     "type": "array",
                     "description": "Queue objects that are either the endpoint for an SNS Operation Binding Object, or the deadLetterQueue of the SQS Operation Binding Object.",
                     "items": {
-                        "$ref": "#/definitions/bindings-sqs-0.2.0-operation"
+                        "$ref": "#/definitions/bindings-sqs-0.2.0-operation/definitions/queue"
                     }
                 },
                 "bindingVersion": {
@@ -7688,10 +7688,10 @@
                             "default": 345600
                         },
                         "redrivePolicy": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation/definitions/redrivePolicy"
                         },
                         "policy": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation/definitions/policy"
                         },
                         "tags": {
                             "type": "object",
@@ -7712,7 +7712,7 @@
                     },
                     "properties": {
                         "deadLetterQueue": {
-                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation"
+                            "$ref": "#/definitions/bindings-sqs-0.2.0-operation/definitions/identifier"
                         },
                         "maxReceiveCount": {
                             "type": "integer",
@@ -7756,7 +7756,7 @@
                             "type": "array",
                             "description": "An array of statement objects, each of which controls a permission for this queue.",
                             "items": {
-                                "$ref": "#/definitions/bindings-sqs-0.2.0-operation"
+                                "$ref": "#/definitions/bindings-sqs-0.2.0-operation/definitions/statement"
                             }
                         }
                     },
diff --git a/schemas/3.0.0.json b/schemas/3.0.0.json
index 22f2f2c8..97d236f7 100644
--- a/schemas/3.0.0.json
+++ b/schemas/3.0.0.json
@@ -2752,7 +2752,7 @@
                         "description": "Definition of the message payload. It can be of any type but defaults to Schema Object. It MUST match the schema format defined in schemaFormat, including the encoding type. E.g., Avro should be inlined as either a YAML or JSON object instead of as a string to be parsed as YAML or JSON. Non-JSON-based schemas (e.g., Protobuf or XSD) MUST be inlined as a string."
                     }
                 },
-                "allOf": [
+                "anyOf": [
                     {
                         "if": {
                             "not": {
diff --git a/tools/bundler/index.js b/tools/bundler/index.js
index c405b2e4..d8729ad0 100644
--- a/tools/bundler/index.js
+++ b/tools/bundler/index.js
@@ -165,7 +165,13 @@ function getDefinitionName(def) {
   }
   if (def.startsWith('http://asyncapi.com/bindings')) {
     const result = bindingsRegex.exec(def);
-    if (result) return `${result[1].replace('/', '-')}-${result[2]}-${result[3]}`;
+    if (result) {
+      if (result[4] === '') {
+        return `${result[1].replace('/', '-')}-${result[2]}-${result[3]}`;
+      } else {
+        return `${result[1].replace('/', '-')}-${result[2]}-${result[3]}/${result[4].replace('#/', '')}`;
+      }
+    }
   }
   
   return path.basename(def, '.json');