diff --git a/Java/Class.java.twig b/Java/Class.java.twig
index 63a5590..07401e3 100644
--- a/Java/Class.java.twig
+++ b/Java/Class.java.twig
@@ -2,7 +2,7 @@
 /**
  * This code is autogenerated by Touch Instinct tools
  */
-package {{ packageName }};
+package {{ packageName }}.api;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -13,6 +13,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,6 +21,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.HashMap;
 
+import org.joda.time.DateTime;
+
 import ru.touchin.templates.ApiModel;
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 import ru.touchin.templates.logansquare.LoganSquareJsonModel;
diff --git a/Java/Enum.java.twig b/Java/Enum.java.twig
index 5534144..0db8004 100644
--- a/Java/Enum.java.twig
+++ b/Java/Enum.java.twig
@@ -2,7 +2,7 @@
 /**
  * This code is autogenerated by Touch Instinct tools
  */
-package {{ packageName }};
+package {{ packageName }}.api;
 
 import android.support.annotation.NonNull;
 
diff --git a/Java/Methods.java.twig b/Java/Methods.java.twig
index 683e5db..89d1c71 100644
--- a/Java/Methods.java.twig
+++ b/Java/Methods.java.twig
@@ -1,7 +1,7 @@
 /**
  * This code is autogenerated by Touch Instinct tools
  */
-package {{ packageName }};
+package {{ packageName }}.api;
 
 import android.support.annotation.NonNull;
 
diff --git a/Java/utils.twig b/Java/utils.twig
index eee9f81..15a58c9 100644
--- a/Java/utils.twig
+++ b/Java/utils.twig
@@ -90,7 +90,7 @@ new HashMap<>({{ fieldName }})
 {%- if optional -%}
 {{ object }}.{{ fieldName }} = new JsonOptional({{- self.formatNullableValueSetter(fieldName, valueType, nullable) -}});
 {%- elseif nullable -%}
-{{ object }}.{{ fieldName }} = self.formatNullableValueSetter(fieldName, valueType, nullable);
+{{ object }}.{{ fieldName }} = {{ self.formatNullableValueSetter(fieldName, valueType, nullable)}};
 {%- else -%}
 {{ object }}.{{ fieldName }} = {{ fieldName }};
 {%- endif -%}
@@ -119,7 +119,7 @@ Collections.unmodifiableMap({{ fieldName }})
 {%- if optional -%}
 return new JsonOptional({{- self.formatNullableValueGetter(fieldName, valueType, nullable) -}});
 {%- elseif nullable -%}
-return self.formatNullableValueGetter(fieldName, valueType, nullable);
+return {{ self.formatNullableValueGetter(fieldName, valueType, nullable) }};
 {%- else -%}
 return this.{{ fieldName }};
 {%- endif -%}