diff --git a/Swift/macroses/common.utils.twig b/Swift/macroses/common.utils.twig
index 9efcc65..313a7f7 100644
--- a/Swift/macroses/common.utils.twig
+++ b/Swift/macroses/common.utils.twig
@@ -7,10 +7,12 @@
 {% endmacro %}
 
 {% macro formatValueType(valueType) %}
+    {%- import _self as self -%}
+
     {%- if valueType.baseTypeName == "Array" -%}
-        [{{ valueType.itemsType.baseTypeName }}]
+        [{{ self.formatValueType(valueType.itemsType) }}]
     {%- elseif valueType.baseTypeName == "Map" -%}
-        [{{ valueType.keysType.baseTypeName }}: {{ valueType.valuesType.baseTypeName }}]
+        [{{ self.formatValueType(valueType.keysType) }}: {{ self.formatValueType(valueType.valuesType) }}]
     {%- elseif valueType.baseTypeName == "DateTime" -%}
         Date
     {%- elseif valueType.baseTypeName == "Long" -%}