diff --git a/templates/api.repository.contract.mustache b/templates/api.repository.contract.mustache
index ea80935..ee2a2ae 100644
--- a/templates/api.repository.contract.mustache
+++ b/templates/api.repository.contract.mustache
@@ -22,7 +22,7 @@ export interface {{classname}}Repository {
    * @param {{paramName}} {{description}}
    {{/allParams}}
    */
-  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{dataType}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
+  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
 
 {{/operation}}
 }
diff --git a/templates/api.repository.impl.mustache b/templates/api.repository.impl.mustache
index e51764b..e02ce0d 100644
--- a/templates/api.repository.impl.mustache
+++ b/templates/api.repository.impl.mustache
@@ -27,22 +27,22 @@ export class {{classname}}RepositoryImpl extends MRepository implements {{classn
   }
 
 {{#operation}}
-  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{dataType}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
     {{#isListContainer}}
-    return this.{{httpMethod}}<{{returnBaseType}}Dto>('{{path}}'{{#hasQueryParams}}, {
+    return this.{{httpMethod}}<{{{returnBaseType}}}Dto>('{{path}}'{{#hasQueryParams}}, {
       params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
     }{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
       .pipe(
-        map((response) => response.{{#vendorExtensions}}{{x-response-property}}{{/vendorExtensions}}{{^vendorExtensions}}items{{/vendorExtensions}}.map({{returnBaseType}}Mapper))
+        map((response) => response.{{#vendorExtensions}}{{x-response-property}}{{/vendorExtensions}}{{^vendorExtensions}}items{{/vendorExtensions}}.map({{{returnBaseType}}}Mapper))
       );
     {{/isListContainer}}
     {{^isListContainer}}
     {{#returnType}}
-    return this.{{httpMethod}}<{{returnType}}Dto>('{{path}}'{{#hasQueryParams}}, {
+    return this.{{httpMethod}}<{{{returnType}}}Dto>('{{path}}'{{#hasQueryParams}}, {
       params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
     }{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
       .pipe(
-        map({{returnType}}Mapper)
+        map({{{returnType}}}Mapper)
       );
     {{/returnType}}
     {{^returnType}}
diff --git a/templates/api.use-cases.contract.mustache b/templates/api.use-cases.contract.mustache
index 096c8f7..7ab4efe 100644
--- a/templates/api.use-cases.contract.mustache
+++ b/templates/api.use-cases.contract.mustache
@@ -22,7 +22,7 @@ export interface {{classname}}UseCases {
    * @param {{paramName}} {{description}}
    {{/allParams}}
    */
-  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{dataType}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
+  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
 
 {{/operation}}
 }
diff --git a/templates/api.use-cases.impl.mustache b/templates/api.use-cases.impl.mustache
index 297770e..140f204 100644
--- a/templates/api.use-cases.impl.mustache
+++ b/templates/api.use-cases.impl.mustache
@@ -20,7 +20,7 @@ export class {{classname}}UseCasesImpl implements {{classname}}UseCases {
   #{{classVarName}}Repository: {{classname}}Repository = inject({{constantName}}_REPOSITORY);
 
 {{#operation}}
-  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{dataType}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+  {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
     return this.#{{classVarName}}Repository.{{nickname}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
   }
 
diff --git a/templates/model-entity.mustache b/templates/model-entity.mustache
index dc227f3..65fbc8f 100644
--- a/templates/model-entity.mustache
+++ b/templates/model-entity.mustache
@@ -16,7 +16,7 @@ export class {{classname}} {
    * {{description}}
    */
 {{/description}}
-  {{name}}{{^required}}?{{/required}}: {{dataType}};
+  {{name}}{{^required}}?{{/required}}: {{{dataType}}};
 {{/vars}}
 }
 
diff --git a/templates/model.mustache b/templates/model.mustache
index ee2523b..d9ee6a6 100644
--- a/templates/model.mustache
+++ b/templates/model.mustache
@@ -12,7 +12,7 @@ export interface {{classname}}Dto {
    * {{description}}
    */
 {{/description}}
-  {{name}}{{^required}}?{{/required}}: {{dataType}};
+  {{name}}{{^required}}?{{/required}}: {{{dataType}}};
 {{/vars}}
 }