diff --git a/gradle/jsonModelsGeneration.gradle b/gradle/jsonModelsGeneration.gradle
index dadf9f1..4f9ef41 100644
--- a/gradle/jsonModelsGeneration.gradle
+++ b/gradle/jsonModelsGeneration.gradle
@@ -776,13 +776,18 @@ class ClassObject extends SchemeObject {
         for (final FieldInfo field : fields) {
             final int argIndex = typeArguments.indexOf(field.typeName.toString())
             if (argIndex >= 0) {
-                result.addParameter(ParameterSpec.builder(ClassName.bestGuess(childTypeArguments.get(argIndex)), field.name, Modifier.FINAL)
-                        .addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
-                        .build())
+                final ParameterSpec.Builder paramBuilder = ParameterSpec
+                        .builder(ClassName.bestGuess(childTypeArguments.get(argIndex)), field.name, Modifier.FINAL)
+                if (!field.typeName.primitive) {
+                    paramBuilder.addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
+                }
+                result.addParameter(paramBuilder.build())
             } else {
-                result.addParameter(ParameterSpec.builder(field.typeName, field.name, Modifier.FINAL)
-                        .addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
-                        .build())
+                final ParameterSpec.Builder paramBuilder = ParameterSpec.builder(field.typeName, field.name, Modifier.FINAL)
+                if (!field.typeName.primitive) {
+                    paramBuilder.addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
+                }
+                result.addParameter(paramBuilder.build())
             }
             parameters.add(field.name)
         }
@@ -792,6 +797,7 @@ class ClassObject extends SchemeObject {
     @Override
     void writeToFile(final File directory, final Map<String, SchemeObject> objects, final String packageName) {
         final TypeSpec.Builder classBuilder = TypeSpec.classBuilder(name).addModifiers(Modifier.PUBLIC)
+                .addJavadoc("This class is autogenerated by Touchin tools")
                 .addAnnotation(AnnotationSpec.builder(Types.JSON_OBJECT).addMember("serializeNullObjects", "true").build())
                 .superclass(superclass != null ? superclass : Types.LOGAN_SQUARE_JSON_MODEL)
 
@@ -877,9 +883,11 @@ class ClassObject extends SchemeObject {
             }
 
             if (fullConstructorBuilder != null) {
-                fullConstructorBuilder.addParameter(ParameterSpec.builder(field.typeName, field.name, Modifier.FINAL)
-                        .addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
-                        .build())
+                final ParameterSpec.Builder paramBuilder = ParameterSpec.builder(field.typeName, field.name, Modifier.FINAL)
+                if (!field.typeName.primitive) {
+                    paramBuilder.addAnnotation(field.couldContainsNull() ? Types.NULLABLE : Types.NON_NULL)
+                }
+                fullConstructorBuilder.addParameter(paramBuilder.build())
             }
             if (field.type == FieldType.LIST) {
                 if (fullConstructorBuilder != null) {