diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroArraySchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroArraySchema.java
index 498c066b..e2543a6c 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroArraySchema.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroArraySchema.java
@@ -6,7 +6,11 @@
 /**
  * @see <a href="https://avro.apache.org/docs/1.9.0/spec.html#Arrays">Arrays</a>
  */
-public class AvroArraySchema {
+public class AvroArraySchema extends AvroSchema {
+
+    public AvroArraySchema() {
+        super(AvroSchemaType.ARRAY);
+    }
 
     @NotNull
     @JsonProperty("items")
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroEnumSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroEnumSchema.java
index abac9386..4fe12a8d 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroEnumSchema.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroEnumSchema.java
@@ -12,7 +12,11 @@
  *
  * @see <a href="https://avro.apache.org/docs/1.9.0/spec.html#Enums">Enums</a>
  */
-public class AvroEnumSchema {
+public class AvroEnumSchema extends AvroSchema {
+
+    public AvroEnumSchema() {
+        super(AvroSchemaType.ENUM);
+    }
 
     @NotNull
     @JsonProperty("name")
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroFixedSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroFixedSchema.java
index f329d988..7aba05ed 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroFixedSchema.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroFixedSchema.java
@@ -9,7 +9,11 @@
 /**
  * @see <a href="https://avro.apache.org/docs/1.9.0/spec.html#Arrays">Arrays</a>
  */
-public class AvroFixedSchema {
+public class AvroFixedSchema extends AvroSchema {
+
+    public AvroFixedSchema() {
+        super(AvroSchemaType.FIXED);
+    }
 
     @NotNull
     @JsonProperty("name")
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroMapSchema.java b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroMapSchema.java
index 519ad91f..1b0ecfd3 100644
--- a/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroMapSchema.java
+++ b/asyncapi-core/src/main/java/com/asyncapi/v3/schema/avro/AvroMapSchema.java
@@ -6,7 +6,11 @@
 /**
  * @see <a href="https://avro.apache.org/docs/1.9.0/spec.html#Maps">Maps</a>
  */
-public class AvroMapSchema {
+public class AvroMapSchema extends AvroSchema {
+
+    public AvroMapSchema() {
+        super(AvroSchemaType.MAP);
+    }
 
     @NotNull
     @JsonProperty("values")