diff --git a/src/templates/partials/schemaArray.hbs b/src/templates/partials/schemaArray.hbs
index efc1f298..1aeb0c4d 100644
--- a/src/templates/partials/schemaArray.hbs
+++ b/src/templates/partials/schemaArray.hbs
@@ -1,7 +1,11 @@
 {
-    array: {
-        type: '{{>base}}',
+{{#if link}}
+    arrayOf: {{>schema link}},
+{{else}}
+    arrayOf: {
+        type: '{{{base}}}',
     },
+{{/if}}
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
 {{/if}}
diff --git a/src/templates/partials/schemaDictionary.hbs b/src/templates/partials/schemaDictionary.hbs
index 7334bd04..236e4706 100644
--- a/src/templates/partials/schemaDictionary.hbs
+++ b/src/templates/partials/schemaDictionary.hbs
@@ -1,7 +1,11 @@
 {
-    dictionary: {
-        type: '{{>base}}',
+{{#if link}}
+    dictionaryOf: {{>schema link}},
+{{else}}
+    dictionaryOf: {
+        type: '{{{base}}}',
     },
+{{/if}}
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
 {{/if}}
diff --git a/src/templates/partials/schemaGeneric.hbs b/src/templates/partials/schemaGeneric.hbs
index a2306847..dc81e351 100644
--- a/src/templates/partials/schemaGeneric.hbs
+++ b/src/templates/partials/schemaGeneric.hbs
@@ -1,6 +1,6 @@
 {
 {{#if type}}
-    type: '{{>base}}',
+    type: '{{{base}}}',
 {{/if}}
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},