diff --git a/pom.xml b/pom.xml
index 335842cd0396dac337a1805c1dcca76fb13cd0b2..a7402ea7eec972a130ad302e407f24115ae2675e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.eeeffff.yapidoc</groupId>
     <artifactId>yapidoc</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 
     <name>${project.artifactId}</name>
     <description>Maven plugin used to generate yapi document for Java controllers</description>
diff --git a/yapidoc-core/pom.xml b/yapidoc-core/pom.xml
index 4e3a3e2bce5c8d306d8f3d344434252cb469b65b..3e409ee0ffe3597732ccc20227a2bd7565b50fde 100644
--- a/yapidoc-core/pom.xml
+++ b/yapidoc-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>yapidoc</artifactId>
 		<groupId>com.eeeffff.yapidoc</groupId>
-		<version>1.0.5</version>
+		<version>1.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java b/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
index 245e44c1e1cddf4efe025ce11f766012dcfa5e7b..d938f309222167d01f986adcc21f1f961e791509 100644
--- a/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
+++ b/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
@@ -297,6 +297,11 @@ public class ModelResolver implements ModelConverter {
 						.schemaProperty(true).propertyName(targetClass.getName());
 				propSchema = new ArraySchema().items(context.resolve(aType));
 			} else {
+				JavaClass fieldGenericityContentType = null;
+                if (genericityCount(field.getType()) > 0) {
+                    fieldGenericityContentType = genericityContentType(field.getType());
+                }
+
 				PrimitiveType primitiveType = PrimitiveType.fromType(field.getType().getFullyQualifiedName());
 				if (primitiveType != null) {
 					propSchema = primitiveType.createProperty();
@@ -310,7 +315,14 @@ public class ModelResolver implements ModelConverter {
 										&& context.getDefinedModels().containsKey(typeName)) {
 									propSchema.set$ref(constructRef(typeName));
 								}
-							}
+							} else if (fieldGenericityContentType != null && DocUtils.isList(
+                                field.getType().getBinaryName())) {
+                                aType = new AnnotatedType().javaClass(fieldGenericityContentType).parent(schema)
+                                    .resolveAsRef(annotatedType.isResolveAsRef())
+                                    .jsonViewAnnotation(annotatedType.getJsonViewAnnotation()).skipSchemaName(true)
+                                    .schemaProperty(true).propertyName(field.getType().getName());
+                                propSchema = new ArraySchema().items(context.resolve(aType));
+                            }
 						}
 					}
 				}
diff --git a/yapidoc-maven-plugin/pom.xml b/yapidoc-maven-plugin/pom.xml
index d370e947de410fea23e9e4fc74779c8e6ffc12b1..9980551de7a7e3ee1415a80bddba756fd4bb2914 100644
--- a/yapidoc-maven-plugin/pom.xml
+++ b/yapidoc-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>yapidoc</artifactId>
 		<groupId>com.eeeffff.yapidoc</groupId>
-		<version>1.0.5</version>
+		<version>1.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>