diff --git a/definitions/2.0.0/message.json b/definitions/2.0.0/message.json
index 0b360823..238964f3 100644
--- a/definitions/2.0.0/message.json
+++ b/definitions/2.0.0/message.json
@@ -119,7 +119,70 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.0.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.0.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.1.0/message.json b/definitions/2.1.0/message.json
index 29b69d3b..87243207 100644
--- a/definitions/2.1.0/message.json
+++ b/definitions/2.1.0/message.json
@@ -139,7 +139,73 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.1.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.1.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.2.0/message.json b/definitions/2.2.0/message.json
index b211849b..8627e4e7 100644
--- a/definitions/2.2.0/message.json
+++ b/definitions/2.2.0/message.json
@@ -139,7 +139,76 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.2.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+                      "application/vnd.aai.asyncapi;version=2.2.0",
+                      "application/vnd.aai.asyncapi+json;version=2.2.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.2.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.2.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.3.0/message.json b/definitions/2.3.0/message.json
index cb3a9ea5..e43d4f61 100644
--- a/definitions/2.3.0/message.json
+++ b/definitions/2.3.0/message.json
@@ -139,7 +139,79 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.3.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+                      "application/vnd.aai.asyncapi;version=2.2.0",
+                      "application/vnd.aai.asyncapi+json;version=2.2.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+                      "application/vnd.aai.asyncapi;version=2.3.0",
+                      "application/vnd.aai.asyncapi+json;version=2.3.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.3.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.3.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.4.0/message.json b/definitions/2.4.0/message.json
index 97ee42d7..60ef1cab 100644
--- a/definitions/2.4.0/message.json
+++ b/definitions/2.4.0/message.json
@@ -142,7 +142,82 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.4.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+                      "application/vnd.aai.asyncapi;version=2.2.0",
+                      "application/vnd.aai.asyncapi+json;version=2.2.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+                      "application/vnd.aai.asyncapi;version=2.3.0",
+                      "application/vnd.aai.asyncapi+json;version=2.3.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.3.0",
+                      "application/vnd.aai.asyncapi;version=2.4.0",
+                      "application/vnd.aai.asyncapi+json;version=2.4.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.4.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.4.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.5.0/message.json b/definitions/2.5.0/message.json
index ca9a84c1..2dc35688 100644
--- a/definitions/2.5.0/message.json
+++ b/definitions/2.5.0/message.json
@@ -136,7 +136,85 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+                      "application/vnd.aai.asyncapi;version=2.2.0",
+                      "application/vnd.aai.asyncapi+json;version=2.2.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+                      "application/vnd.aai.asyncapi;version=2.3.0",
+                      "application/vnd.aai.asyncapi+json;version=2.3.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.3.0",
+                      "application/vnd.aai.asyncapi;version=2.4.0",
+                      "application/vnd.aai.asyncapi+json;version=2.4.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.4.0",
+                      "application/vnd.aai.asyncapi;version=2.5.0",
+                      "application/vnd.aai.asyncapi+json;version=2.5.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.5.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/definitions/2.6.0/message.json b/definitions/2.6.0/message.json
index a2caf0b8..ad3d32d1 100644
--- a/definitions/2.6.0/message.json
+++ b/definitions/2.6.0/message.json
@@ -136,7 +136,88 @@
                 ]
               }
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "not": {
+                  "required": [
+                    "schemaFormat"
+                  ]
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.6.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.aai.asyncapi;version=2.0.0",
+                      "application/vnd.aai.asyncapi+json;version=2.0.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+                      "application/vnd.aai.asyncapi;version=2.1.0",
+                      "application/vnd.aai.asyncapi+json;version=2.1.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+                      "application/vnd.aai.asyncapi;version=2.2.0",
+                      "application/vnd.aai.asyncapi+json;version=2.2.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+                      "application/vnd.aai.asyncapi;version=2.3.0",
+                      "application/vnd.aai.asyncapi+json;version=2.3.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.3.0",
+                      "application/vnd.aai.asyncapi;version=2.4.0",
+                      "application/vnd.aai.asyncapi+json;version=2.4.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.4.0",
+                      "application/vnd.aai.asyncapi;version=2.5.0",
+                      "application/vnd.aai.asyncapi+json;version=2.5.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.5.0",
+                      "application/vnd.aai.asyncapi;version=2.6.0",
+                      "application/vnd.aai.asyncapi+json;version=2.6.0",
+                      "application/vnd.aai.asyncapi+yaml;version=2.6.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.6.0/schema.json"
+                  }
+                }
+              }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/schema+json;version=draft-07",
+                      "application/schema+yaml;version=draft-07"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://json-schema.org/draft-07/schema"
+                  }
+                }
+              }
+            }
+          ]
         }
       ]
     }