diff --git a/generator/dummyClasses/oracle.js b/generator/dummyClasses/oracle.js
new file mode 100644
index 00000000..80202db6
--- /dev/null
+++ b/generator/dummyClasses/oracle.js
@@ -0,0 +1,25 @@
+class ClassName {
+	/**
+	 *
+	 * @param {module} do Oracle SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(ocisdk, params, clientConfiguration) {
+		this._oci = ocisdk;
+		this._sdkclassName = this._oci.SDKClassName(
+			params,
+			clientConfiguration
+		);
+	}
+
+	function() {
+		return new Promise((resolve, reject) => {
+			this._sdkClassName
+				.SDKFunctionName()
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+}
+
+module.exports = ClassName;
diff --git a/generator/generatedClasses/AWS/appServices/aws-paaS.js b/generator/generatedClasses/AWS/appServices/aws-paaS.js
index f6eee331..f8e62ded 100644
--- a/generator/generatedClasses/AWS/appServices/aws-paaS.js
+++ b/generator/generatedClasses/AWS/appServices/aws-paaS.js
@@ -4,280 +4,295 @@
  * @category AWS
  */
 class AWS_PaaS {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._elasticBeanstalk = new this._AWS.ElasticBeanstalk({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the checkDNSAvailability function of ElasticBeanstalk
-   * @param {CheckDNSAvailabilityMessage} params - Data required for checkDNSAvailability
-   * @returns {Promise<checkDNSAvailabilityResponse>}
-   */
-  checkDNSAvailability(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.checkDNSAvailability(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the composeEnvironments function of ElasticBeanstalk
-   * @param {ComposeEnvironmentsMessage} params - Data required for composeEnvironments
-   * @returns {Promise<composeEnvironmentsResponse>}
-   */
-  composeEnvironments(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.composeEnvironments(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createApplication function of ElasticBeanstalk
-   * @param {CreateApplicationMessage} params - Data required for createApplication
-   * @returns {Promise<createApplicationResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.createApplication(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createConfigurationTemplate function of ElasticBeanstalk
-   * @param {CreateConfigurationTemplateMessage} params - Data required for createConfigurationTemplate
-   * @returns {Promise<createConfigurationTemplateResponse>}
-   */
-  createConfigTemplate(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.createConfigurationTemplate(
-        params,
-        (error, data) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(data);
-          }
-        }
-      );
-    });
-  }
-  /**
-   * Trigers the createEnvironment function of ElasticBeanstalk
-   * @param {CreateEnvironmentMessage} params - Data required for createEnvironment
-   * @returns {Promise<createEnvironmentResponse>}
-   */
-  createEnvironment(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.createEnvironment(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createStorageLocation function of ElasticBeanstalk
-   * @returns {Promise<createStorageLocationResponse>}
-   */
-  createStorageLocation() {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.createStorageLocation((error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteApplication function of ElasticBeanstalk
-   * @param {DeleteApplicationMessage} params - Data required for deleteApplication
-   * @returns {Promise<deleteApplicationResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.deleteApplication(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteConfigurationTemplate function of ElasticBeanstalk
-   * @param {DeleteConfigurationTemplateMessage} params - Data required for deleteConfigurationTemplate
-   * @returns {Promise<deleteConfigurationTemplateResponse>}
-   */
-  deleteConfigTemplate(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.deleteConfigurationTemplate(
-        params,
-        (error, data) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(data);
-          }
-        }
-      );
-    });
-  }
-  /**
-   * Trigers the describeAccountAttributes function of ElasticBeanstalk
-   * @returns {Promise<describeAccountAttributesResponse>}
-   */
-  describeAccountAttributes() {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.describeAccountAttributes((error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeApplications function of ElasticBeanstalk
-   * @param {DescribeApplicationsMessage} params - Data required for describeApplications
-   * @returns {Promise<describeApplicationsResponse>}
-   */
-  describe(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.describeApplications(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeConfigurationSettings function of ElasticBeanstalk
-   * @param {DescribeConfigurationSettingsMessage} params - Data required for describeConfigurationSettings
-   * @returns {Promise<describeConfigurationSettingsResponse>}
-   */
-  describeConfigSettings(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.describeConfigurationSettings(
-        params,
-        (error, data) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(data);
-          }
-        }
-      );
-    });
-  }
-  /**
-   * Trigers the listPlatformVersions function of ElasticBeanstalk
-   * @param {ListPlatformVersionsRequest} params - Data required for listPlatformVersions
-   * @returns {Promise<listPlatformVersionsResponse>}
-   */
-  listVersions(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.listPlatformVersions(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the restartAppServer function of ElasticBeanstalk
-   * @param {RestartAppServerMessage} params - Data required for restartAppServer
-   * @returns {Promise<restartAppServerResponse>}
-   */
-  restart(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.restartAppServer(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the terminateEnvironment function of ElasticBeanstalk
-   * @param {TerminateEnvironmentMessage} params - Data required for terminateEnvironment
-   * @returns {Promise<terminateEnvironmentResponse>}
-   */
-  terminateEnvironment(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.terminateEnvironment(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the updateApplication function of ElasticBeanstalk
-   * @param {UpdateApplicationMessage} params - Data required for updateApplication
-   * @returns {Promise<updateApplicationResponse>}
-   */
-  update(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.updateApplication(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the updateEnvironment function of ElasticBeanstalk
-   * @param {UpdateEnvironmentMessage} params - Data required for updateEnvironment
-   * @returns {Promise<updateEnvironmentResponse>}
-   */
-  updateEnvironment(params) {
-    return new Promise((resolve, reject) => {
-      this._elasticBeanstalk.updateEnvironment(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._elasticBeanstalk = new this._AWS.ElasticBeanstalk({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the checkDNSAvailability function of ElasticBeanstalk
+	 * @param {CheckDNSAvailabilityMessage} params - Data required for checkDNSAvailability
+	 * @returns {Promise<checkDNSAvailabilityResponse>}
+	 */
+	checkDNSAvailability(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.checkDNSAvailability(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the composeEnvironments function of ElasticBeanstalk
+	 * @param {ComposeEnvironmentsMessage} params - Data required for composeEnvironments
+	 * @returns {Promise<composeEnvironmentsResponse>}
+	 */
+	composeEnvironments(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.composeEnvironments(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the createApplication function of ElasticBeanstalk
+	 * @param {CreateApplicationMessage} params - Data required for createApplication
+	 * @returns {Promise<createApplicationResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.createApplication(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createConfigurationTemplate function of ElasticBeanstalk
+	 * @param {CreateConfigurationTemplateMessage} params - Data required for createConfigurationTemplate
+	 * @returns {Promise<createConfigurationTemplateResponse>}
+	 */
+	createConfigTemplate(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.createConfigurationTemplate(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the createEnvironment function of ElasticBeanstalk
+	 * @param {CreateEnvironmentMessage} params - Data required for createEnvironment
+	 * @returns {Promise<createEnvironmentResponse>}
+	 */
+	createEnvironment(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.createEnvironment(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createStorageLocation function of ElasticBeanstalk
+	 * @returns {Promise<createStorageLocationResponse>}
+	 */
+	createStorageLocation() {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.createStorageLocation((error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteApplication function of ElasticBeanstalk
+	 * @param {DeleteApplicationMessage} params - Data required for deleteApplication
+	 * @returns {Promise<deleteApplicationResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.deleteApplication(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteConfigurationTemplate function of ElasticBeanstalk
+	 * @param {DeleteConfigurationTemplateMessage} params - Data required for deleteConfigurationTemplate
+	 * @returns {Promise<deleteConfigurationTemplateResponse>}
+	 */
+	deleteConfigTemplate(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.deleteConfigurationTemplate(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the describeAccountAttributes function of ElasticBeanstalk
+	 * @returns {Promise<describeAccountAttributesResponse>}
+	 */
+	describeAccountAttributes() {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.describeAccountAttributes((error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeApplications function of ElasticBeanstalk
+	 * @param {DescribeApplicationsMessage} params - Data required for describeApplications
+	 * @returns {Promise<describeApplicationsResponse>}
+	 */
+	describe(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.describeApplications(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the describeConfigurationSettings function of ElasticBeanstalk
+	 * @param {DescribeConfigurationSettingsMessage} params - Data required for describeConfigurationSettings
+	 * @returns {Promise<describeConfigurationSettingsResponse>}
+	 */
+	describeConfigSettings(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.describeConfigurationSettings(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the listPlatformVersions function of ElasticBeanstalk
+	 * @param {ListPlatformVersionsRequest} params - Data required for listPlatformVersions
+	 * @returns {Promise<listPlatformVersionsResponse>}
+	 */
+	listVersions(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.listPlatformVersions(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the restartAppServer function of ElasticBeanstalk
+	 * @param {RestartAppServerMessage} params - Data required for restartAppServer
+	 * @returns {Promise<restartAppServerResponse>}
+	 */
+	restart(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.restartAppServer(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the terminateEnvironment function of ElasticBeanstalk
+	 * @param {TerminateEnvironmentMessage} params - Data required for terminateEnvironment
+	 * @returns {Promise<terminateEnvironmentResponse>}
+	 */
+	terminateEnvironment(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.terminateEnvironment(
+				params,
+				(error, data) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve(data);
+					}
+				}
+			);
+		});
+	}
+	/**
+	 * Trigers the updateApplication function of ElasticBeanstalk
+	 * @param {UpdateApplicationMessage} params - Data required for updateApplication
+	 * @returns {Promise<updateApplicationResponse>}
+	 */
+	update(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.updateApplication(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the updateEnvironment function of ElasticBeanstalk
+	 * @param {UpdateEnvironmentMessage} params - Data required for updateEnvironment
+	 * @returns {Promise<updateEnvironmentResponse>}
+	 */
+	updateEnvironment(params) {
+		return new Promise((resolve, reject) => {
+			this._elasticBeanstalk.updateEnvironment(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_PaaS;
diff --git a/generator/generatedClasses/AWS/artificialinteligence/aws-translation.js b/generator/generatedClasses/AWS/artificialinteligence/aws-translation.js
index 978c2249..c89ce192 100644
--- a/generator/generatedClasses/AWS/artificialinteligence/aws-translation.js
+++ b/generator/generatedClasses/AWS/artificialinteligence/aws-translation.js
@@ -4,97 +4,97 @@
  * @category AWS
  */
 class AWS_Translation {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._translate = new this._AWS.Translate({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the deleteTerminology function of Translate
-   * @param {DeleteTerminologyRequest} params - Data required for deleteTerminology
-   * @returns {Promise<deleteTerminologyResponse>}
-   */
-  deleteGlossary(params) {
-    return new Promise((resolve, reject) => {
-      this._translate.deleteTerminology(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the getTerminology function of Translate
-   * @param {GetTerminologyRequest} params - Data required for getTerminology
-   * @returns {Promise<getTerminologyResponse>}
-   */
-  getGlossary(params) {
-    return new Promise((resolve, reject) => {
-      this._translate.getTerminology(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the importTerminology function of Translate
-   * @param {ImportTerminologyRequest} params - Data required for importTerminology
-   * @returns {Promise<importTerminologyResponse>}
-   */
-  createGlossary(params) {
-    return new Promise((resolve, reject) => {
-      this._translate.importTerminology(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the startTextTranslationJob function of Translate
-   * @param {StartTextTranslationJobRequest} params - Data required for startTextTranslationJob
-   * @returns {Promise<startTextTranslationJobResponse>}
-   */
-  batchTranslate(params) {
-    return new Promise((resolve, reject) => {
-      this._translate.startTextTranslationJob(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the translateText function of Translate
-   * @param {TranslateTextRequest} params - Data required for translateText
-   * @returns {Promise<translateTextResponse>}
-   */
-  translate(params) {
-    return new Promise((resolve, reject) => {
-      this._translate.translateText(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._translate = new this._AWS.Translate({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the deleteTerminology function of Translate
+	 * @param {DeleteTerminologyRequest} params - Data required for deleteTerminology
+	 * @returns {Promise<deleteTerminologyResponse>}
+	 */
+	deleteGlossary(params) {
+		return new Promise((resolve, reject) => {
+			this._translate.deleteTerminology(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the getTerminology function of Translate
+	 * @param {GetTerminologyRequest} params - Data required for getTerminology
+	 * @returns {Promise<getTerminologyResponse>}
+	 */
+	getGlossary(params) {
+		return new Promise((resolve, reject) => {
+			this._translate.getTerminology(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the importTerminology function of Translate
+	 * @param {ImportTerminologyRequest} params - Data required for importTerminology
+	 * @returns {Promise<importTerminologyResponse>}
+	 */
+	createGlossary(params) {
+		return new Promise((resolve, reject) => {
+			this._translate.importTerminology(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the startTextTranslationJob function of Translate
+	 * @param {StartTextTranslationJobRequest} params - Data required for startTextTranslationJob
+	 * @returns {Promise<startTextTranslationJobResponse>}
+	 */
+	batchTranslate(params) {
+		return new Promise((resolve, reject) => {
+			this._translate.startTextTranslationJob(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the translateText function of Translate
+	 * @param {TranslateTextRequest} params - Data required for translateText
+	 * @returns {Promise<translateTextResponse>}
+	 */
+	translate(params) {
+		return new Promise((resolve, reject) => {
+			this._translate.translateText(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_Translation;
diff --git a/generator/generatedClasses/AWS/compute/aws-computeInstance.js b/generator/generatedClasses/AWS/compute/aws-computeInstance.js
index e3010568..7ac04a34 100644
--- a/generator/generatedClasses/AWS/compute/aws-computeInstance.js
+++ b/generator/generatedClasses/AWS/compute/aws-computeInstance.js
@@ -4,161 +4,161 @@
  * @category AWS
  */
 class AWS_ComputeInstance {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._eC2 = new this._AWS.EC2({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createTags function of EC2
-   * @param {CreateTagsRequest} params - Data required for createTags
-   * @returns {Promise<createTagsResponse>}
-   */
-  addTags(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.createTags(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeInstances function of EC2
-   * @param {DescribeInstancesRequest} params - Data required for describeInstances
-   * @returns {Promise<describeInstancesResponse>}
-   */
-  list(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.describeInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the monitorInstances function of EC2
-   * @param {MonitorInstancesRequest} params - Data required for monitorInstances
-   * @returns {Promise<monitorInstancesResponse>}
-   */
-  monitor(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.monitorInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the rebootInstances function of EC2
-   * @param {RebootInstancesRequest} params - Data required for rebootInstances
-   * @returns {Promise<rebootInstancesResponse>}
-   */
-  reboot(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.rebootInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the runInstances function of EC2
-   * @param {RunInstancesRequest} params - Data required for runInstances
-   * @returns {Promise<runInstancesResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.runInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the startInstances function of EC2
-   * @param {StartInstancesRequest} params - Data required for startInstances
-   * @returns {Promise<startInstancesResponse>}
-   */
-  start(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.startInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the stopInstances function of EC2
-   * @param {StopInstancesRequest} params - Data required for stopInstances
-   * @returns {Promise<stopInstancesResponse>}
-   */
-  stop(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.stopInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the terminateInstances function of EC2
-   * @param {TerminateInstancesRequest} params - Data required for terminateInstances
-   * @returns {Promise<terminateInstancesResponse>}
-   */
-  destroy(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.terminateInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the unmonitorInstances function of EC2
-   * @param {UnmonitorInstancesRequest} params - Data required for unmonitorInstances
-   * @returns {Promise<unmonitorInstancesResponse>}
-   */
-  unmonitor(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.unmonitorInstances(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._eC2 = new this._AWS.EC2({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createTags function of EC2
+	 * @param {CreateTagsRequest} params - Data required for createTags
+	 * @returns {Promise<createTagsResponse>}
+	 */
+	addTags(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.createTags(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeInstances function of EC2
+	 * @param {DescribeInstancesRequest} params - Data required for describeInstances
+	 * @returns {Promise<describeInstancesResponse>}
+	 */
+	list(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.describeInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the monitorInstances function of EC2
+	 * @param {MonitorInstancesRequest} params - Data required for monitorInstances
+	 * @returns {Promise<monitorInstancesResponse>}
+	 */
+	monitor(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.monitorInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the rebootInstances function of EC2
+	 * @param {RebootInstancesRequest} params - Data required for rebootInstances
+	 * @returns {Promise<rebootInstancesResponse>}
+	 */
+	reboot(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.rebootInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the runInstances function of EC2
+	 * @param {RunInstancesRequest} params - Data required for runInstances
+	 * @returns {Promise<runInstancesResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.runInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the startInstances function of EC2
+	 * @param {StartInstancesRequest} params - Data required for startInstances
+	 * @returns {Promise<startInstancesResponse>}
+	 */
+	start(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.startInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the stopInstances function of EC2
+	 * @param {StopInstancesRequest} params - Data required for stopInstances
+	 * @returns {Promise<stopInstancesResponse>}
+	 */
+	stop(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.stopInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the terminateInstances function of EC2
+	 * @param {TerminateInstancesRequest} params - Data required for terminateInstances
+	 * @returns {Promise<terminateInstancesResponse>}
+	 */
+	destroy(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.terminateInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the unmonitorInstances function of EC2
+	 * @param {UnmonitorInstancesRequest} params - Data required for unmonitorInstances
+	 * @returns {Promise<unmonitorInstancesResponse>}
+	 */
+	unmonitor(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.unmonitorInstances(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_ComputeInstance;
diff --git a/generator/generatedClasses/AWS/compute/aws-container.js b/generator/generatedClasses/AWS/compute/aws-container.js
index 2e9e6863..44da8f96 100644
--- a/generator/generatedClasses/AWS/compute/aws-container.js
+++ b/generator/generatedClasses/AWS/compute/aws-container.js
@@ -4,81 +4,81 @@
  * @category AWS
  */
 class AWS_Container {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._eCS = new this._AWS.ECS({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createCluster function of ECS
-   * @param {CreateClusterRequest} params - Data required for createCluster
-   * @returns {Promise<createClusterResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._eCS.createCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteCluster function of ECS
-   * @param {DeleteClusterRequest} params - Data required for deleteCluster
-   * @returns {Promise<deleteClusterResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._eCS.deleteCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeClusters function of ECS
-   * @param {DescribeClustersRequest} params - Data required for describeClusters
-   * @returns {Promise<describeClustersResponse>}
-   */
-  describe(params) {
-    return new Promise((resolve, reject) => {
-      this._eCS.describeClusters(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listClusters function of ECS
-   * @param {ListClustersRequest} params - Data required for listClusters
-   * @returns {Promise<listClustersResponse>}
-   */
-  list(params) {
-    return new Promise((resolve, reject) => {
-      this._eCS.listClusters(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._eCS = new this._AWS.ECS({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createCluster function of ECS
+	 * @param {CreateClusterRequest} params - Data required for createCluster
+	 * @returns {Promise<createClusterResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._eCS.createCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteCluster function of ECS
+	 * @param {DeleteClusterRequest} params - Data required for deleteCluster
+	 * @returns {Promise<deleteClusterResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._eCS.deleteCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeClusters function of ECS
+	 * @param {DescribeClustersRequest} params - Data required for describeClusters
+	 * @returns {Promise<describeClustersResponse>}
+	 */
+	describe(params) {
+		return new Promise((resolve, reject) => {
+			this._eCS.describeClusters(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listClusters function of ECS
+	 * @param {ListClustersRequest} params - Data required for listClusters
+	 * @returns {Promise<listClustersResponse>}
+	 */
+	list(params) {
+		return new Promise((resolve, reject) => {
+			this._eCS.listClusters(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_Container;
diff --git a/generator/generatedClasses/AWS/compute/aws-kubernetes.js b/generator/generatedClasses/AWS/compute/aws-kubernetes.js
index 394d8b9a..6381ac0f 100644
--- a/generator/generatedClasses/AWS/compute/aws-kubernetes.js
+++ b/generator/generatedClasses/AWS/compute/aws-kubernetes.js
@@ -4,177 +4,177 @@
  * @category AWS
  */
 class AWS_Kubernetes {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._eKS = new this._AWS.EKS({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createCluster function of EKS
-   * @param {CreateClusterRequest} params - Data required for createCluster
-   * @returns {Promise<createClusterResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.createCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createNodegroup function of EKS
-   * @param {CreateNodegroupRequest} params - Data required for createNodegroup
-   * @returns {Promise<createNodegroupResponse>}
-   */
-  createNodeGroup(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.createNodegroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteCluster function of EKS
-   * @param {DeleteClusterRequest} params - Data required for deleteCluster
-   * @returns {Promise<deleteClusterResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.deleteCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteNodegroup function of EKS
-   * @param {DeleteNodegroupRequest} params - Data required for deleteNodegroup
-   * @returns {Promise<deleteNodegroupResponse>}
-   */
-  deleteNodegroup(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.deleteNodegroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeCluster function of EKS
-   * @param {DescribeClusterRequest} params - Data required for describeCluster
-   * @returns {Promise<describeClusterResponse>}
-   */
-  describeCluster(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.describeCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeNodegroup function of EKS
-   * @param {DescribeNodegroupRequest} params - Data required for describeNodegroup
-   * @returns {Promise<describeNodegroupResponse>}
-   */
-  describeNodeGroup(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.describeNodegroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listClusters function of EKS
-   * @param {ListClustersRequest} params - Data required for listClusters
-   * @returns {Promise<listClustersResponse>}
-   */
-  listClusters(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.listClusters(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listNodegroups function of EKS
-   * @param {ListNodegroupsRequest} params - Data required for listNodegroups
-   * @returns {Promise<listNodegroupsResponse>}
-   */
-  listNodegroups(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.listNodegroups(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the tagResource function of EKS
-   * @param {TagResourceRequest} params - Data required for tagResource
-   * @returns {Promise<tagResourceResponse>}
-   */
-  updateTags(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.tagResource(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the updateClusterConfig function of EKS
-   * @param {UpdateClusterConfigRequest} params - Data required for updateClusterConfig
-   * @returns {Promise<updateClusterConfigResponse>}
-   */
-  updateConfig(params) {
-    return new Promise((resolve, reject) => {
-      this._eKS.updateClusterConfig(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._eKS = new this._AWS.EKS({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createCluster function of EKS
+	 * @param {CreateClusterRequest} params - Data required for createCluster
+	 * @returns {Promise<createClusterResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.createCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createNodegroup function of EKS
+	 * @param {CreateNodegroupRequest} params - Data required for createNodegroup
+	 * @returns {Promise<createNodegroupResponse>}
+	 */
+	createNodeGroup(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.createNodegroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteCluster function of EKS
+	 * @param {DeleteClusterRequest} params - Data required for deleteCluster
+	 * @returns {Promise<deleteClusterResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.deleteCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteNodegroup function of EKS
+	 * @param {DeleteNodegroupRequest} params - Data required for deleteNodegroup
+	 * @returns {Promise<deleteNodegroupResponse>}
+	 */
+	deleteNodegroup(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.deleteNodegroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeCluster function of EKS
+	 * @param {DescribeClusterRequest} params - Data required for describeCluster
+	 * @returns {Promise<describeClusterResponse>}
+	 */
+	describeCluster(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.describeCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeNodegroup function of EKS
+	 * @param {DescribeNodegroupRequest} params - Data required for describeNodegroup
+	 * @returns {Promise<describeNodegroupResponse>}
+	 */
+	describeNodeGroup(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.describeNodegroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listClusters function of EKS
+	 * @param {ListClustersRequest} params - Data required for listClusters
+	 * @returns {Promise<listClustersResponse>}
+	 */
+	listClusters(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.listClusters(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listNodegroups function of EKS
+	 * @param {ListNodegroupsRequest} params - Data required for listNodegroups
+	 * @returns {Promise<listNodegroupsResponse>}
+	 */
+	listNodegroups(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.listNodegroups(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the tagResource function of EKS
+	 * @param {TagResourceRequest} params - Data required for tagResource
+	 * @returns {Promise<tagResourceResponse>}
+	 */
+	updateTags(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.tagResource(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the updateClusterConfig function of EKS
+	 * @param {UpdateClusterConfigRequest} params - Data required for updateClusterConfig
+	 * @returns {Promise<updateClusterConfigResponse>}
+	 */
+	updateConfig(params) {
+		return new Promise((resolve, reject) => {
+			this._eKS.updateClusterConfig(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_Kubernetes;
diff --git a/generator/generatedClasses/AWS/database/aws-RDBMS.js b/generator/generatedClasses/AWS/database/aws-RDBMS.js
index 215ab2fb..b53f2bcb 100644
--- a/generator/generatedClasses/AWS/database/aws-RDBMS.js
+++ b/generator/generatedClasses/AWS/database/aws-RDBMS.js
@@ -4,113 +4,113 @@
  * @category AWS
  */
 class AWS_RDBMS {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._rDS = new this._AWS.RDS({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createDBCluster function of RDS
-   * @param {CreateDBClusterMessage} params - Data required for createDBCluster
-   * @returns {Promise<createDBClusterResponse>}
-   */
-  createDatabse(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.createDBCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createDBSnapshot function of RDS
-   * @param {CreateDBSnapshotMessage} params - Data required for createDBSnapshot
-   * @returns {Promise<createDBSnapshotResponse>}
-   */
-  createSnapshots(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.createDBSnapshot(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteDBCluster function of RDS
-   * @param {DeleteDBClusterMessage} params - Data required for deleteDBCluster
-   * @returns {Promise<deleteDBClusterResponse>}
-   */
-  deleteDatabase(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.deleteDBCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteDBSnapshot function of RDS
-   * @param {DeleteDBSnapshotMessage} params - Data required for deleteDBSnapshot
-   * @returns {Promise<deleteDBSnapshotResponse>}
-   */
-  deleteDBSnapshot(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.deleteDBSnapshot(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the modifyDBCluster function of RDS
-   * @param {ModifyDBClusterMessage} params - Data required for modifyDBCluster
-   * @returns {Promise<modifyDBClusterResponse>}
-   */
-  modifyDB(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.modifyDBCluster(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the rebootDBInstance function of RDS
-   * @param {RebootDBInstanceMessage} params - Data required for rebootDBInstance
-   * @returns {Promise<rebootDBInstanceResponse>}
-   */
-  restoreDatabase(params) {
-    return new Promise((resolve, reject) => {
-      this._rDS.rebootDBInstance(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._rDS = new this._AWS.RDS({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createDBCluster function of RDS
+	 * @param {CreateDBClusterMessage} params - Data required for createDBCluster
+	 * @returns {Promise<createDBClusterResponse>}
+	 */
+	createDatabse(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.createDBCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createDBSnapshot function of RDS
+	 * @param {CreateDBSnapshotMessage} params - Data required for createDBSnapshot
+	 * @returns {Promise<createDBSnapshotResponse>}
+	 */
+	createSnapshots(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.createDBSnapshot(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteDBCluster function of RDS
+	 * @param {DeleteDBClusterMessage} params - Data required for deleteDBCluster
+	 * @returns {Promise<deleteDBClusterResponse>}
+	 */
+	deleteDatabase(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.deleteDBCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteDBSnapshot function of RDS
+	 * @param {DeleteDBSnapshotMessage} params - Data required for deleteDBSnapshot
+	 * @returns {Promise<deleteDBSnapshotResponse>}
+	 */
+	deleteDBSnapshot(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.deleteDBSnapshot(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the modifyDBCluster function of RDS
+	 * @param {ModifyDBClusterMessage} params - Data required for modifyDBCluster
+	 * @returns {Promise<modifyDBClusterResponse>}
+	 */
+	modifyDB(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.modifyDBCluster(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the rebootDBInstance function of RDS
+	 * @param {RebootDBInstanceMessage} params - Data required for rebootDBInstance
+	 * @returns {Promise<rebootDBInstanceResponse>}
+	 */
+	restoreDatabase(params) {
+		return new Promise((resolve, reject) => {
+			this._rDS.rebootDBInstance(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_RDBMS;
diff --git a/generator/generatedClasses/AWS/database/aws-noSql.js b/generator/generatedClasses/AWS/database/aws-noSql.js
index c11898c9..3eebfbbd 100644
--- a/generator/generatedClasses/AWS/database/aws-noSql.js
+++ b/generator/generatedClasses/AWS/database/aws-noSql.js
@@ -4,113 +4,113 @@
  * @category AWS
  */
 class AWS_NoSql {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._dynamoDB = new this._AWS.DynamoDB({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createTable function of DynamoDB
-   * @param {CreateTableInput} params - Data required for createTable
-   * @returns {Promise<createTableResponse>}
-   */
-  createTable(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.createTable(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteItem function of DynamoDB
-   * @param {DeleteItemInput} params - Data required for deleteItem
-   * @returns {Promise<deleteItemResponse>}
-   */
-  deleteItem(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.deleteItem(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteTable function of DynamoDB
-   * @param {DeleteTableInput} params - Data required for deleteTable
-   * @returns {Promise<deleteTableResponse>}
-   */
-  deleteTable(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.deleteTable(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the putItem function of DynamoDB
-   * @param {PutItemInput} params - Data required for putItem
-   * @returns {Promise<putItemResponse>}
-   */
-  createItem(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.putItem(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the query function of DynamoDB
-   * @param {QueryInput} params - Data required for query
-   * @returns {Promise<queryResponse>}
-   */
-  query(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.query(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the updateItem function of DynamoDB
-   * @param {UpdateItemInput} params - Data required for updateItem
-   * @returns {Promise<updateItemResponse>}
-   */
-  updateItem(params) {
-    return new Promise((resolve, reject) => {
-      this._dynamoDB.updateItem(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._dynamoDB = new this._AWS.DynamoDB({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createTable function of DynamoDB
+	 * @param {CreateTableInput} params - Data required for createTable
+	 * @returns {Promise<createTableResponse>}
+	 */
+	createTable(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.createTable(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteItem function of DynamoDB
+	 * @param {DeleteItemInput} params - Data required for deleteItem
+	 * @returns {Promise<deleteItemResponse>}
+	 */
+	deleteItem(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.deleteItem(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteTable function of DynamoDB
+	 * @param {DeleteTableInput} params - Data required for deleteTable
+	 * @returns {Promise<deleteTableResponse>}
+	 */
+	deleteTable(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.deleteTable(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the putItem function of DynamoDB
+	 * @param {PutItemInput} params - Data required for putItem
+	 * @returns {Promise<putItemResponse>}
+	 */
+	createItem(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.putItem(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the query function of DynamoDB
+	 * @param {QueryInput} params - Data required for query
+	 * @returns {Promise<queryResponse>}
+	 */
+	query(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.query(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the updateItem function of DynamoDB
+	 * @param {UpdateItemInput} params - Data required for updateItem
+	 * @returns {Promise<updateItemResponse>}
+	 */
+	updateItem(params) {
+		return new Promise((resolve, reject) => {
+			this._dynamoDB.updateItem(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_NoSql;
diff --git a/generator/generatedClasses/AWS/database/aws-noSqlIndexed.js b/generator/generatedClasses/AWS/database/aws-noSqlIndexed.js
index c86ffc13..82128eef 100644
--- a/generator/generatedClasses/AWS/database/aws-noSqlIndexed.js
+++ b/generator/generatedClasses/AWS/database/aws-noSqlIndexed.js
@@ -4,161 +4,161 @@
  * @category AWS
  */
 class AWS_NoSqlIndexed {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._simpleDB = new this._AWS.SimpleDB({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the batchDeleteAttributes function of SimpleDB
-   * @param {BatchDeleteAttributesRequest} params - Data required for batchDeleteAttributes
-   * @returns {Promise<batchDeleteAttributesResponse>}
-   */
-  batchDelete(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.batchDeleteAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the batchPutAttributes function of SimpleDB
-   * @param {BatchPutAttributesRequest} params - Data required for batchPutAttributes
-   * @returns {Promise<batchPutAttributesResponse>}
-   */
-  batchWrite(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.batchPutAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createDomain function of SimpleDB
-   * @param {CreateDomainRequest} params - Data required for createDomain
-   * @returns {Promise<createDomainResponse>}
-   */
-  createCollection(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.createDomain(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteAttributes function of SimpleDB
-   * @param {DeleteAttributesRequest} params - Data required for deleteAttributes
-   * @returns {Promise<deleteAttributesResponse>}
-   */
-  deleteAttribute(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.deleteAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteDomain function of SimpleDB
-   * @param {DeleteDomainRequest} params - Data required for deleteDomain
-   * @returns {Promise<deleteDomainResponse>}
-   */
-  deleteCollection(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.deleteDomain(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the getAttributes function of SimpleDB
-   * @param {GetAttributesRequest} params - Data required for getAttributes
-   * @returns {Promise<getAttributesResponse>}
-   */
-  getAttributes(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.getAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listDomains function of SimpleDB
-   * @param {ListDomainsRequest} params - Data required for listDomains
-   * @returns {Promise<listDomainsResponse>}
-   */
-  listCollections(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.listDomains(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the putAttributes function of SimpleDB
-   * @param {PutAttributesRequest} params - Data required for putAttributes
-   * @returns {Promise<putAttributesResponse>}
-   */
-  setAttribute(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.putAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the select function of SimpleDB
-   * @param {SelectRequest} params - Data required for select
-   * @returns {Promise<selectResponse>}
-   */
-  query(params) {
-    return new Promise((resolve, reject) => {
-      this._simpleDB.select(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._simpleDB = new this._AWS.SimpleDB({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the batchDeleteAttributes function of SimpleDB
+	 * @param {BatchDeleteAttributesRequest} params - Data required for batchDeleteAttributes
+	 * @returns {Promise<batchDeleteAttributesResponse>}
+	 */
+	batchDelete(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.batchDeleteAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the batchPutAttributes function of SimpleDB
+	 * @param {BatchPutAttributesRequest} params - Data required for batchPutAttributes
+	 * @returns {Promise<batchPutAttributesResponse>}
+	 */
+	batchWrite(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.batchPutAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createDomain function of SimpleDB
+	 * @param {CreateDomainRequest} params - Data required for createDomain
+	 * @returns {Promise<createDomainResponse>}
+	 */
+	createCollection(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.createDomain(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteAttributes function of SimpleDB
+	 * @param {DeleteAttributesRequest} params - Data required for deleteAttributes
+	 * @returns {Promise<deleteAttributesResponse>}
+	 */
+	deleteAttribute(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.deleteAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteDomain function of SimpleDB
+	 * @param {DeleteDomainRequest} params - Data required for deleteDomain
+	 * @returns {Promise<deleteDomainResponse>}
+	 */
+	deleteCollection(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.deleteDomain(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the getAttributes function of SimpleDB
+	 * @param {GetAttributesRequest} params - Data required for getAttributes
+	 * @returns {Promise<getAttributesResponse>}
+	 */
+	getAttributes(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.getAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listDomains function of SimpleDB
+	 * @param {ListDomainsRequest} params - Data required for listDomains
+	 * @returns {Promise<listDomainsResponse>}
+	 */
+	listCollections(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.listDomains(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the putAttributes function of SimpleDB
+	 * @param {PutAttributesRequest} params - Data required for putAttributes
+	 * @returns {Promise<putAttributesResponse>}
+	 */
+	setAttribute(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.putAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the select function of SimpleDB
+	 * @param {SelectRequest} params - Data required for select
+	 * @returns {Promise<selectResponse>}
+	 */
+	query(params) {
+		return new Promise((resolve, reject) => {
+			this._simpleDB.select(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_NoSqlIndexed;
diff --git a/generator/generatedClasses/AWS/management/aws-keyManagement.js b/generator/generatedClasses/AWS/management/aws-keyManagement.js
index 7bab4b56..c311e123 100644
--- a/generator/generatedClasses/AWS/management/aws-keyManagement.js
+++ b/generator/generatedClasses/AWS/management/aws-keyManagement.js
@@ -4,97 +4,97 @@
  * @category AWS
  */
 class AWS_KeyManagement {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._kMS = new this._AWS.KMS({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createKey function of KMS
-   * @param {CreateKeyRequest} params - Data required for createKey
-   * @returns {Promise<createKeyResponse>}
-   */
-  createKey(params) {
-    return new Promise((resolve, reject) => {
-      this._kMS.createKey(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteCustomKeyStore function of KMS
-   * @param {DeleteCustomKeyStoreRequest} params - Data required for deleteCustomKeyStore
-   * @returns {Promise<deleteCustomKeyStoreResponse>}
-   */
-  deleteKey(params) {
-    return new Promise((resolve, reject) => {
-      this._kMS.deleteCustomKeyStore(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeKey function of KMS
-   * @param {DescribeKeyRequest} params - Data required for describeKey
-   * @returns {Promise<describeKeyResponse>}
-   */
-  describeKey(params) {
-    return new Promise((resolve, reject) => {
-      this._kMS.describeKey(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the putKeyPolicy function of KMS
-   * @param {PutKeyPolicyRequest} params - Data required for putKeyPolicy
-   * @returns {Promise<putKeyPolicyResponse>}
-   */
-  putKeyPolicy(params) {
-    return new Promise((resolve, reject) => {
-      this._kMS.putKeyPolicy(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the updateKeyDescription function of KMS
-   * @param {UpdateKeyDescriptionRequest} params - Data required for updateKeyDescription
-   * @returns {Promise<updateKeyDescriptionResponse>}
-   */
-  update(params) {
-    return new Promise((resolve, reject) => {
-      this._kMS.updateKeyDescription(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._kMS = new this._AWS.KMS({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createKey function of KMS
+	 * @param {CreateKeyRequest} params - Data required for createKey
+	 * @returns {Promise<createKeyResponse>}
+	 */
+	createKey(params) {
+		return new Promise((resolve, reject) => {
+			this._kMS.createKey(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteCustomKeyStore function of KMS
+	 * @param {DeleteCustomKeyStoreRequest} params - Data required for deleteCustomKeyStore
+	 * @returns {Promise<deleteCustomKeyStoreResponse>}
+	 */
+	deleteKey(params) {
+		return new Promise((resolve, reject) => {
+			this._kMS.deleteCustomKeyStore(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeKey function of KMS
+	 * @param {DescribeKeyRequest} params - Data required for describeKey
+	 * @returns {Promise<describeKeyResponse>}
+	 */
+	describeKey(params) {
+		return new Promise((resolve, reject) => {
+			this._kMS.describeKey(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the putKeyPolicy function of KMS
+	 * @param {PutKeyPolicyRequest} params - Data required for putKeyPolicy
+	 * @returns {Promise<putKeyPolicyResponse>}
+	 */
+	putKeyPolicy(params) {
+		return new Promise((resolve, reject) => {
+			this._kMS.putKeyPolicy(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the updateKeyDescription function of KMS
+	 * @param {UpdateKeyDescriptionRequest} params - Data required for updateKeyDescription
+	 * @returns {Promise<updateKeyDescriptionResponse>}
+	 */
+	update(params) {
+		return new Promise((resolve, reject) => {
+			this._kMS.updateKeyDescription(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_KeyManagement;
diff --git a/generator/generatedClasses/AWS/management/aws-monitoring.js b/generator/generatedClasses/AWS/management/aws-monitoring.js
index ba4a17de..24c83246 100644
--- a/generator/generatedClasses/AWS/management/aws-monitoring.js
+++ b/generator/generatedClasses/AWS/management/aws-monitoring.js
@@ -4,81 +4,81 @@
  * @category AWS
  */
 class AWS_Monitoring {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._cloudWatch = new this._AWS.CloudWatch({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the deleteAlarms function of CloudWatch
-   * @param {DeleteAlarmsInput} params - Data required for deleteAlarms
-   * @returns {Promise<deleteAlarmsResponse>}
-   */
-  deleteAlarm(params) {
-    return new Promise((resolve, reject) => {
-      this._cloudWatch.deleteAlarms(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the getMetricData function of CloudWatch
-   * @param {GetMetricDataInput} params - Data required for getMetricData
-   * @returns {Promise<getMetricDataResponse>}
-   */
-  getMetricData(params) {
-    return new Promise((resolve, reject) => {
-      this._cloudWatch.getMetricData(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listMetrics function of CloudWatch
-   * @param {ListMetricsInput} params - Data required for listMetrics
-   * @returns {Promise<listMetricsResponse>}
-   */
-  listAlarms(params) {
-    return new Promise((resolve, reject) => {
-      this._cloudWatch.listMetrics(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the putMetricAlarm function of CloudWatch
-   * @param {PutMetricAlarmInput} params - Data required for putMetricAlarm
-   * @returns {Promise<putMetricAlarmResponse>}
-   */
-  updateAlarm(params) {
-    return new Promise((resolve, reject) => {
-      this._cloudWatch.putMetricAlarm(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._cloudWatch = new this._AWS.CloudWatch({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the deleteAlarms function of CloudWatch
+	 * @param {DeleteAlarmsInput} params - Data required for deleteAlarms
+	 * @returns {Promise<deleteAlarmsResponse>}
+	 */
+	deleteAlarm(params) {
+		return new Promise((resolve, reject) => {
+			this._cloudWatch.deleteAlarms(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the getMetricData function of CloudWatch
+	 * @param {GetMetricDataInput} params - Data required for getMetricData
+	 * @returns {Promise<getMetricDataResponse>}
+	 */
+	getMetricData(params) {
+		return new Promise((resolve, reject) => {
+			this._cloudWatch.getMetricData(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listMetrics function of CloudWatch
+	 * @param {ListMetricsInput} params - Data required for listMetrics
+	 * @returns {Promise<listMetricsResponse>}
+	 */
+	listAlarms(params) {
+		return new Promise((resolve, reject) => {
+			this._cloudWatch.listMetrics(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the putMetricAlarm function of CloudWatch
+	 * @param {PutMetricAlarmInput} params - Data required for putMetricAlarm
+	 * @returns {Promise<putMetricAlarmResponse>}
+	 */
+	updateAlarm(params) {
+		return new Promise((resolve, reject) => {
+			this._cloudWatch.putMetricAlarm(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_Monitoring;
diff --git a/generator/generatedClasses/AWS/management/aws-notificationService.js b/generator/generatedClasses/AWS/management/aws-notificationService.js
index 7e37e378..50efb35e 100644
--- a/generator/generatedClasses/AWS/management/aws-notificationService.js
+++ b/generator/generatedClasses/AWS/management/aws-notificationService.js
@@ -4,145 +4,145 @@
  * @category AWS
  */
 class AWS_NotificationService {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._sNS = new this._AWS.SNS({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createTopic function of SNS
-   * @param {CreateTopicInput} params - Data required for createTopic
-   * @returns {Promise<createTopicResponse>}
-   */
-  createTopic(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.createTopic(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteTopic function of SNS
-   * @param {DeleteTopicInput} params - Data required for deleteTopic
-   * @returns {Promise<deleteTopicResponse>}
-   */
-  deleteTopic(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.deleteTopic(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the getTopicAttributes function of SNS
-   * @param {GetTopicAttributesInput} params - Data required for getTopicAttributes
-   * @returns {Promise<getTopicAttributesResponse>}
-   */
-  getTopicAttributes(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.getTopicAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listSubscriptions function of SNS
-   * @param {ListSubscriptionsInput} params - Data required for listSubscriptions
-   * @returns {Promise<listSubscriptionsResponse>}
-   */
-  listSubscriptions(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.listSubscriptions(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listTopics function of SNS
-   * @param {ListTopicsInput} params - Data required for listTopics
-   * @returns {Promise<listTopicsResponse>}
-   */
-  listTopics(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.listTopics(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the publish function of SNS
-   * @param {PublishInput} params - Data required for publish
-   * @returns {Promise<publishResponse>}
-   */
-  publish(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.publish(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the subscribe function of SNS
-   * @param {SubscribeInput} params - Data required for subscribe
-   * @returns {Promise<subscribeResponse>}
-   */
-  subscribe(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.subscribe(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the unsubscribe function of SNS
-   * @param {UnsubscribeInput} params - Data required for unsubscribe
-   * @returns {Promise<unsubscribeResponse>}
-   */
-  unsubscribe(params) {
-    return new Promise((resolve, reject) => {
-      this._sNS.unsubscribe(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._sNS = new this._AWS.SNS({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createTopic function of SNS
+	 * @param {CreateTopicInput} params - Data required for createTopic
+	 * @returns {Promise<createTopicResponse>}
+	 */
+	createTopic(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.createTopic(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteTopic function of SNS
+	 * @param {DeleteTopicInput} params - Data required for deleteTopic
+	 * @returns {Promise<deleteTopicResponse>}
+	 */
+	deleteTopic(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.deleteTopic(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the getTopicAttributes function of SNS
+	 * @param {GetTopicAttributesInput} params - Data required for getTopicAttributes
+	 * @returns {Promise<getTopicAttributesResponse>}
+	 */
+	getTopicAttributes(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.getTopicAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listSubscriptions function of SNS
+	 * @param {ListSubscriptionsInput} params - Data required for listSubscriptions
+	 * @returns {Promise<listSubscriptionsResponse>}
+	 */
+	listSubscriptions(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.listSubscriptions(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listTopics function of SNS
+	 * @param {ListTopicsInput} params - Data required for listTopics
+	 * @returns {Promise<listTopicsResponse>}
+	 */
+	listTopics(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.listTopics(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the publish function of SNS
+	 * @param {PublishInput} params - Data required for publish
+	 * @returns {Promise<publishResponse>}
+	 */
+	publish(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.publish(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the subscribe function of SNS
+	 * @param {SubscribeInput} params - Data required for subscribe
+	 * @returns {Promise<subscribeResponse>}
+	 */
+	subscribe(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.subscribe(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the unsubscribe function of SNS
+	 * @param {UnsubscribeInput} params - Data required for unsubscribe
+	 * @returns {Promise<unsubscribeResponse>}
+	 */
+	unsubscribe(params) {
+		return new Promise((resolve, reject) => {
+			this._sNS.unsubscribe(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_NotificationService;
diff --git a/generator/generatedClasses/AWS/network/aws-DNS.js b/generator/generatedClasses/AWS/network/aws-DNS.js
index 422f035b..7a62602f 100644
--- a/generator/generatedClasses/AWS/network/aws-DNS.js
+++ b/generator/generatedClasses/AWS/network/aws-DNS.js
@@ -4,81 +4,81 @@
  * @category AWS
  */
 class AWS_DNS {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._route53 = new this._AWS.Route53({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the changeResourceRecordSets function of Route53
-   * @param {ChangeResourceRecordSetsRequest} params - Data required for changeResourceRecordSets
-   * @returns {Promise<changeResourceRecordSetsResponse>}
-   */
-  changeRecordSets(params) {
-    return new Promise((resolve, reject) => {
-      this._route53.changeResourceRecordSets(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createHostedZone function of Route53
-   * @param {CreateHostedZoneRequest} params - Data required for createHostedZone
-   * @returns {Promise<createHostedZoneResponse>}
-   */
-  createZone(params) {
-    return new Promise((resolve, reject) => {
-      this._route53.createHostedZone(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteHostedZone function of Route53
-   * @param {DeleteHostedZoneRequest} params - Data required for deleteHostedZone
-   * @returns {Promise<deleteHostedZoneResponse>}
-   */
-  deleteZone(params) {
-    return new Promise((resolve, reject) => {
-      this._route53.deleteHostedZone(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listHostedZones function of Route53
-   * @param {ListHostedZonesRequest} params - Data required for listHostedZones
-   * @returns {Promise<listHostedZonesResponse>}
-   */
-  listZones(params) {
-    return new Promise((resolve, reject) => {
-      this._route53.listHostedZones(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._route53 = new this._AWS.Route53({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the changeResourceRecordSets function of Route53
+	 * @param {ChangeResourceRecordSetsRequest} params - Data required for changeResourceRecordSets
+	 * @returns {Promise<changeResourceRecordSetsResponse>}
+	 */
+	changeRecordSets(params) {
+		return new Promise((resolve, reject) => {
+			this._route53.changeResourceRecordSets(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createHostedZone function of Route53
+	 * @param {CreateHostedZoneRequest} params - Data required for createHostedZone
+	 * @returns {Promise<createHostedZoneResponse>}
+	 */
+	createZone(params) {
+		return new Promise((resolve, reject) => {
+			this._route53.createHostedZone(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteHostedZone function of Route53
+	 * @param {DeleteHostedZoneRequest} params - Data required for deleteHostedZone
+	 * @returns {Promise<deleteHostedZoneResponse>}
+	 */
+	deleteZone(params) {
+		return new Promise((resolve, reject) => {
+			this._route53.deleteHostedZone(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listHostedZones function of Route53
+	 * @param {ListHostedZonesRequest} params - Data required for listHostedZones
+	 * @returns {Promise<listHostedZonesResponse>}
+	 */
+	listZones(params) {
+		return new Promise((resolve, reject) => {
+			this._route53.listHostedZones(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_DNS;
diff --git a/generator/generatedClasses/AWS/network/aws-loadBalancer.js b/generator/generatedClasses/AWS/network/aws-loadBalancer.js
index f722dd14..d9eba23b 100644
--- a/generator/generatedClasses/AWS/network/aws-loadBalancer.js
+++ b/generator/generatedClasses/AWS/network/aws-loadBalancer.js
@@ -4,97 +4,97 @@
  * @category AWS
  */
 class AWS_LoadBalancer {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._eLB = new this._AWS.ELB({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the addTags function of ELB
-   * @param {AddTagsInput} params - Data required for addTags
-   * @returns {Promise<addTagsResponse>}
-   */
-  addTags(params) {
-    return new Promise((resolve, reject) => {
-      this._eLB.addTags(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createLoadBalancer function of ELB
-   * @param {CreateAccessPointInput} params - Data required for createLoadBalancer
-   * @returns {Promise<createLoadBalancerResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._eLB.createLoadBalancer(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteLoadBalancer function of ELB
-   * @param {DeleteAccessPointInput} params - Data required for deleteLoadBalancer
-   * @returns {Promise<deleteLoadBalancerResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._eLB.deleteLoadBalancer(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeLoadBalancerAttributes function of ELB
-   * @param {DescribeLoadBalancerAttributesInput} params - Data required for describeLoadBalancerAttributes
-   * @returns {Promise<describeLoadBalancerAttributesResponse>}
-   */
-  describe(params) {
-    return new Promise((resolve, reject) => {
-      this._eLB.describeLoadBalancerAttributes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeLoadBalancers function of ELB
-   * @param {DescribeAccessPointsInput} params - Data required for describeLoadBalancers
-   * @returns {Promise<describeLoadBalancersResponse>}
-   */
-  list(params) {
-    return new Promise((resolve, reject) => {
-      this._eLB.describeLoadBalancers(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._eLB = new this._AWS.ELB({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the addTags function of ELB
+	 * @param {AddTagsInput} params - Data required for addTags
+	 * @returns {Promise<addTagsResponse>}
+	 */
+	addTags(params) {
+		return new Promise((resolve, reject) => {
+			this._eLB.addTags(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createLoadBalancer function of ELB
+	 * @param {CreateAccessPointInput} params - Data required for createLoadBalancer
+	 * @returns {Promise<createLoadBalancerResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._eLB.createLoadBalancer(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteLoadBalancer function of ELB
+	 * @param {DeleteAccessPointInput} params - Data required for deleteLoadBalancer
+	 * @returns {Promise<deleteLoadBalancerResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._eLB.deleteLoadBalancer(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeLoadBalancerAttributes function of ELB
+	 * @param {DescribeLoadBalancerAttributesInput} params - Data required for describeLoadBalancerAttributes
+	 * @returns {Promise<describeLoadBalancerAttributesResponse>}
+	 */
+	describe(params) {
+		return new Promise((resolve, reject) => {
+			this._eLB.describeLoadBalancerAttributes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeLoadBalancers function of ELB
+	 * @param {DescribeAccessPointsInput} params - Data required for describeLoadBalancers
+	 * @returns {Promise<describeLoadBalancersResponse>}
+	 */
+	list(params) {
+		return new Promise((resolve, reject) => {
+			this._eLB.describeLoadBalancers(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_LoadBalancer;
diff --git a/generator/generatedClasses/AWS/security/aws-IAM.js b/generator/generatedClasses/AWS/security/aws-IAM.js
index 265a6a31..9191ab3d 100644
--- a/generator/generatedClasses/AWS/security/aws-IAM.js
+++ b/generator/generatedClasses/AWS/security/aws-IAM.js
@@ -4,97 +4,97 @@
  * @category AWS
  */
 class AWS_IAM {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._iAM = new this._AWS.IAM({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the attachGroupPolicy function of IAM
-   * @param {AttachGroupPolicyRequest} params - Data required for attachGroupPolicy
-   * @returns {Promise<attachGroupPolicyResponse>}
-   */
-  attachGroupPolicy(params) {
-    return new Promise((resolve, reject) => {
-      this._iAM.attachGroupPolicy(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the createGroup function of IAM
-   * @param {CreateGroupRequest} params - Data required for createGroup
-   * @returns {Promise<createGroupResponse>}
-   */
-  createGroup(params) {
-    return new Promise((resolve, reject) => {
-      this._iAM.createGroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteGroup function of IAM
-   * @param {DeleteGroupRequest} params - Data required for deleteGroup
-   * @returns {Promise<deleteGroupResponse>}
-   */
-  deleteGroup(params) {
-    return new Promise((resolve, reject) => {
-      this._iAM.deleteGroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the detachGroupPolicy function of IAM
-   * @param {DetachGroupPolicyRequest} params - Data required for detachGroupPolicy
-   * @returns {Promise<detachGroupPolicyResponse>}
-   */
-  detachGroupPolicy(params) {
-    return new Promise((resolve, reject) => {
-      this._iAM.detachGroupPolicy(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the getGroup function of IAM
-   * @param {GetGroupRequest} params - Data required for getGroup
-   * @returns {Promise<getGroupResponse>}
-   */
-  describe(params) {
-    return new Promise((resolve, reject) => {
-      this._iAM.getGroup(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._iAM = new this._AWS.IAM({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the attachGroupPolicy function of IAM
+	 * @param {AttachGroupPolicyRequest} params - Data required for attachGroupPolicy
+	 * @returns {Promise<attachGroupPolicyResponse>}
+	 */
+	attachGroupPolicy(params) {
+		return new Promise((resolve, reject) => {
+			this._iAM.attachGroupPolicy(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the createGroup function of IAM
+	 * @param {CreateGroupRequest} params - Data required for createGroup
+	 * @returns {Promise<createGroupResponse>}
+	 */
+	createGroup(params) {
+		return new Promise((resolve, reject) => {
+			this._iAM.createGroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteGroup function of IAM
+	 * @param {DeleteGroupRequest} params - Data required for deleteGroup
+	 * @returns {Promise<deleteGroupResponse>}
+	 */
+	deleteGroup(params) {
+		return new Promise((resolve, reject) => {
+			this._iAM.deleteGroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the detachGroupPolicy function of IAM
+	 * @param {DetachGroupPolicyRequest} params - Data required for detachGroupPolicy
+	 * @returns {Promise<detachGroupPolicyResponse>}
+	 */
+	detachGroupPolicy(params) {
+		return new Promise((resolve, reject) => {
+			this._iAM.detachGroupPolicy(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the getGroup function of IAM
+	 * @param {GetGroupRequest} params - Data required for getGroup
+	 * @returns {Promise<getGroupResponse>}
+	 */
+	describe(params) {
+		return new Promise((resolve, reject) => {
+			this._iAM.getGroup(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_IAM;
diff --git a/generator/generatedClasses/AWS/storage/aws-archivalStorage.js b/generator/generatedClasses/AWS/storage/aws-archivalStorage.js
index 2b5236ec..a5189f99 100644
--- a/generator/generatedClasses/AWS/storage/aws-archivalStorage.js
+++ b/generator/generatedClasses/AWS/storage/aws-archivalStorage.js
@@ -4,97 +4,97 @@
  * @category AWS
  */
 class AWS_ArchivalStorage {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._glacier = new this._AWS.Glacier({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createVault function of Glacier
-   * @param {CreateVaultInput} params - Data required for createVault
-   * @returns {Promise<createVaultResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._glacier.createVault(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteArchive function of Glacier
-   * @param {DeleteArchiveInput} params - Data required for deleteArchive
-   * @returns {Promise<deleteArchiveResponse>}
-   */
-  deleteFiles(params) {
-    return new Promise((resolve, reject) => {
-      this._glacier.deleteArchive(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteVault function of Glacier
-   * @param {DeleteVaultInput} params - Data required for deleteVault
-   * @returns {Promise<deleteVaultResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._glacier.deleteVault(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the initiateMultipartUpload function of Glacier
-   * @param {InitiateMultipartUploadInput} params - Data required for initiateMultipartUpload
-   * @returns {Promise<initiateMultipartUploadResponse>}
-   */
-  upload(params) {
-    return new Promise((resolve, reject) => {
-      this._glacier.initiateMultipartUpload(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listParts function of Glacier
-   * @param {ListPartsInput} params - Data required for listParts
-   * @returns {Promise<listPartsResponse>}
-   */
-  list(params) {
-    return new Promise((resolve, reject) => {
-      this._glacier.listParts(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._glacier = new this._AWS.Glacier({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createVault function of Glacier
+	 * @param {CreateVaultInput} params - Data required for createVault
+	 * @returns {Promise<createVaultResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._glacier.createVault(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteArchive function of Glacier
+	 * @param {DeleteArchiveInput} params - Data required for deleteArchive
+	 * @returns {Promise<deleteArchiveResponse>}
+	 */
+	deleteFiles(params) {
+		return new Promise((resolve, reject) => {
+			this._glacier.deleteArchive(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteVault function of Glacier
+	 * @param {DeleteVaultInput} params - Data required for deleteVault
+	 * @returns {Promise<deleteVaultResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._glacier.deleteVault(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the initiateMultipartUpload function of Glacier
+	 * @param {InitiateMultipartUploadInput} params - Data required for initiateMultipartUpload
+	 * @returns {Promise<initiateMultipartUploadResponse>}
+	 */
+	upload(params) {
+		return new Promise((resolve, reject) => {
+			this._glacier.initiateMultipartUpload(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listParts function of Glacier
+	 * @param {ListPartsInput} params - Data required for listParts
+	 * @returns {Promise<listPartsResponse>}
+	 */
+	list(params) {
+		return new Promise((resolve, reject) => {
+			this._glacier.listParts(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_ArchivalStorage;
diff --git a/generator/generatedClasses/AWS/storage/aws-blockStorage.js b/generator/generatedClasses/AWS/storage/aws-blockStorage.js
index 8ada4a2a..b362afec 100644
--- a/generator/generatedClasses/AWS/storage/aws-blockStorage.js
+++ b/generator/generatedClasses/AWS/storage/aws-blockStorage.js
@@ -4,81 +4,81 @@
  * @category AWS
  */
 class AWS_BlockStorage {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._eC2 = new this._AWS.EC2({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createVolume function of EC2
-   * @param {CreateVolumeRequest} params - Data required for createVolume
-   * @returns {Promise<createVolumeResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.createVolume(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteVolume function of EC2
-   * @param {DeleteVolumeRequest} params - Data required for deleteVolume
-   * @returns {Promise<deleteVolumeResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.deleteVolume(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeVolumeAttribute function of EC2
-   * @param {DescribeVolumeAttributeRequest} params - Data required for describeVolumeAttribute
-   * @returns {Promise<describeVolumeAttributeResponse>}
-   */
-  describe(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.describeVolumeAttribute(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the describeVolumes function of EC2
-   * @param {DescribeVolumesRequest} params - Data required for describeVolumes
-   * @returns {Promise<describeVolumesResponse>}
-   */
-  list(params) {
-    return new Promise((resolve, reject) => {
-      this._eC2.describeVolumes(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._eC2 = new this._AWS.EC2({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createVolume function of EC2
+	 * @param {CreateVolumeRequest} params - Data required for createVolume
+	 * @returns {Promise<createVolumeResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.createVolume(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteVolume function of EC2
+	 * @param {DeleteVolumeRequest} params - Data required for deleteVolume
+	 * @returns {Promise<deleteVolumeResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.deleteVolume(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeVolumeAttribute function of EC2
+	 * @param {DescribeVolumeAttributeRequest} params - Data required for describeVolumeAttribute
+	 * @returns {Promise<describeVolumeAttributeResponse>}
+	 */
+	describe(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.describeVolumeAttribute(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the describeVolumes function of EC2
+	 * @param {DescribeVolumesRequest} params - Data required for describeVolumes
+	 * @returns {Promise<describeVolumesResponse>}
+	 */
+	list(params) {
+		return new Promise((resolve, reject) => {
+			this._eC2.describeVolumes(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_BlockStorage;
diff --git a/generator/generatedClasses/AWS/storage/aws-storageBucket.js b/generator/generatedClasses/AWS/storage/aws-storageBucket.js
index ef50b831..f738acfc 100644
--- a/generator/generatedClasses/AWS/storage/aws-storageBucket.js
+++ b/generator/generatedClasses/AWS/storage/aws-storageBucket.js
@@ -4,96 +4,96 @@
  * @category AWS
  */
 class AWS_StorageBucket {
-  /**
-   *
-   * @param {module} aws AWS SDK
-   * @param {object} options SDK options
-   */
-  constructor(aws, options) {
-    this._AWS = aws;
-    this._apiVersion = options.apiVersion;
-    this._s3 = new this._AWS.S3({
-      apiVersion: this._apiVersion
-    });
-  }
-  /**
-   * Trigers the createBucket function of S3
-   * @param {CreateBucketRequest} params - Data required for createBucket
-   * @returns {Promise<createBucketResponse>}
-   */
-  create(params) {
-    return new Promise((resolve, reject) => {
-      this._s3.createBucket(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteBucket function of S3
-   * @param {DeleteBucketRequest} params - Data required for deleteBucket
-   * @returns {Promise<deleteBucketResponse>}
-   */
-  delete(params) {
-    return new Promise((resolve, reject) => {
-      this._s3.deleteBucket(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the deleteObjects function of S3
-   * @param {DeleteObjectsRequest} params - Data required for deleteObjects
-   * @returns {Promise<deleteObjectsResponse>}
-   */
-  deleteFiles(params) {
-    return new Promise((resolve, reject) => {
-      this._s3.deleteObjects(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the listBuckets function of S3
-   * @returns {Promise<listBucketsResponse>}
-   */
-  list() {
-    return new Promise((resolve, reject) => {
-      this._s3.listBuckets((error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
-  /**
-   * Trigers the uploadPart function of S3
-   * @param {UploadPartRequest} params - Data required for uploadPart
-   * @returns {Promise<uploadPartResponse>}
-   */
-  upload(params) {
-    return new Promise((resolve, reject) => {
-      this._s3.uploadPart(params, (error, data) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve(data);
-        }
-      });
-    });
-  }
+	/**
+	 *
+	 * @param {module} aws AWS SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(aws, options) {
+		this._AWS = aws;
+		this._apiVersion = options.apiVersion;
+		this._s3 = new this._AWS.S3({
+			apiVersion: this._apiVersion,
+		});
+	}
+	/**
+	 * Trigers the createBucket function of S3
+	 * @param {CreateBucketRequest} params - Data required for createBucket
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(params) {
+		return new Promise((resolve, reject) => {
+			this._s3.createBucket(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteBucket function of S3
+	 * @param {DeleteBucketRequest} params - Data required for deleteBucket
+	 * @returns {Promise<deleteBucketResponse>}
+	 */
+	delete(params) {
+		return new Promise((resolve, reject) => {
+			this._s3.deleteBucket(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the deleteObjects function of S3
+	 * @param {DeleteObjectsRequest} params - Data required for deleteObjects
+	 * @returns {Promise<deleteObjectsResponse>}
+	 */
+	deleteFiles(params) {
+		return new Promise((resolve, reject) => {
+			this._s3.deleteObjects(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the listBuckets function of S3
+	 * @returns {Promise<listBucketsResponse>}
+	 */
+	list() {
+		return new Promise((resolve, reject) => {
+			this._s3.listBuckets((error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
+	/**
+	 * Trigers the uploadPart function of S3
+	 * @param {UploadPartRequest} params - Data required for uploadPart
+	 * @returns {Promise<uploadPartResponse>}
+	 */
+	upload(params) {
+		return new Promise((resolve, reject) => {
+			this._s3.uploadPart(params, (error, data) => {
+				if (error) {
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	}
 }
 module.exports = AWS_StorageBucket;
diff --git a/generator/generatedClasses/Azure/appServices/azure-paaS.js b/generator/generatedClasses/Azure/appServices/azure-paaS.js
index 02c914e5..db0d3ff8 100644
--- a/generator/generatedClasses/Azure/appServices/azure-paaS.js
+++ b/generator/generatedClasses/Azure/appServices/azure-paaS.js
@@ -1,422 +1,429 @@
-const { WebSiteManagementClient } = require("@azure/arm-appservice");
+const { WebSiteManagementClient } = require('@azure/arm-appservice');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a PaaS object
  * @category Azure
  */
 class Azure_PaaS {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} siteEnvelope - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(resourceGroupName, name, siteEnvelope, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .createOrUpdate(resourceGroupName, name, siteEnvelope, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} siteEnvelope - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  update(resourceGroupName, name, siteEnvelope, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .update(resourceGroupName, name, siteEnvelope, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describe(resourceGroupName, name, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps.get(resourceGroupName, name, options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, name, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .deleteMethod(resourceGroupName, name, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the restart function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<restartResponse>}
-   */
-  restart(resourceGroupName, name, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .restart(resourceGroupName, name, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createOrUpdate function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} hostingEnvironmentEnvelope - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createEnvironment(
-    resourceGroupName,
-    name,
-    hostingEnvironmentEnvelope,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.appServiceEnvironments
-            .createOrUpdate(
-              resourceGroupName,
-              name,
-              hostingEnvironmentEnvelope,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} hostingEnvironmentEnvelope - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  updateEnvironment(
-    resourceGroupName,
-    name,
-    hostingEnvironmentEnvelope,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.appServiceEnvironments
-            .update(
-              resourceGroupName,
-              name,
-              hostingEnvironmentEnvelope,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createOrUpdateSlot function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} siteEnvelope - Mandatory parameter
-   * @param {StringKeyword} slot - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateSlotResponse>}
-   */
-  createConfigTemplate(
-    resourceGroupName,
-    name,
-    siteEnvelope,
-    slot,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .createOrUpdateSlot(
-              resourceGroupName,
-              name,
-              siteEnvelope,
-              slot,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getSlot function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {StringKeyword} slot - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getSlotResponse>}
-   */
-  describeConfigSettings(resourceGroupName, name, slot, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .getSlot(resourceGroupName, name, slot, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteSlot function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {StringKeyword} slot - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteSlotResponse>}
-   */
-  deleteConfigTemplate(resourceGroupName, name, slot, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.webApps
-            .deleteSlot(resourceGroupName, name, slot, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the checkAvailability function of appservice
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<checkAvailabilityResponse>}
-   */
-  checkDNSAvailability(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.domains.checkAvailability(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of appservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  terminateEnvironment(resourceGroupName, name, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new WebSiteManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.appServiceEnvironments
-            .deleteMethod(resourceGroupName, name, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} siteEnvelope - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(resourceGroupName, name, siteEnvelope, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.createOrUpdate(
+							resourceGroupName,
+							name,
+							siteEnvelope,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} siteEnvelope - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	update(resourceGroupName, name, siteEnvelope, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.update(resourceGroupName, name, siteEnvelope, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describe(resourceGroupName, name, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.get(resourceGroupName, name, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, name, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.deleteMethod(resourceGroupName, name, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the restart function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<restartResponse>}
+	 */
+	restart(resourceGroupName, name, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.restart(resourceGroupName, name, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createOrUpdate function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} hostingEnvironmentEnvelope - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createEnvironment(
+		resourceGroupName,
+		name,
+		hostingEnvironmentEnvelope,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.appServiceEnvironments
+						.createOrUpdate(
+							resourceGroupName,
+							name,
+							hostingEnvironmentEnvelope,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} hostingEnvironmentEnvelope - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	updateEnvironment(
+		resourceGroupName,
+		name,
+		hostingEnvironmentEnvelope,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.appServiceEnvironments
+						.update(
+							resourceGroupName,
+							name,
+							hostingEnvironmentEnvelope,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createOrUpdateSlot function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} siteEnvelope - Mandatory parameter
+	 * @param {StringKeyword} slot - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateSlotResponse>}
+	 */
+	createConfigTemplate(
+		resourceGroupName,
+		name,
+		siteEnvelope,
+		slot,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.createOrUpdateSlot(
+							resourceGroupName,
+							name,
+							siteEnvelope,
+							slot,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getSlot function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {StringKeyword} slot - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getSlotResponse>}
+	 */
+	describeConfigSettings(resourceGroupName, name, slot, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.getSlot(resourceGroupName, name, slot, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteSlot function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {StringKeyword} slot - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteSlotResponse>}
+	 */
+	deleteConfigTemplate(resourceGroupName, name, slot, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.webApps
+						.deleteSlot(resourceGroupName, name, slot, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the checkAvailability function of appservice
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<checkAvailabilityResponse>}
+	 */
+	checkDNSAvailability(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.domains.checkAvailability(options).then(result => {
+						resolve(result);
+					});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of appservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	terminateEnvironment(resourceGroupName, name, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new WebSiteManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.appServiceEnvironments
+						.deleteMethod(resourceGroupName, name, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_PaaS;
diff --git a/generator/generatedClasses/Azure/compute/azure-computeInstance.js b/generator/generatedClasses/Azure/compute/azure-computeInstance.js
index 8029d665..d793562a 100644
--- a/generator/generatedClasses/Azure/compute/azure-computeInstance.js
+++ b/generator/generatedClasses/Azure/compute/azure-computeInstance.js
@@ -1,202 +1,207 @@
-const { ComputeManagementClient } = require("@azure/arm-compute");
+const { ComputeManagementClient } = require('@azure/arm-compute');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a ComputeInstance object
  * @category Azure
  */
 class Azure_ComputeInstance {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vmName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(resourceGroupName, vmName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .createOrUpdate(resourceGroupName, vmName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  list(resourceGroupName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .list(resourceGroupName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the start function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vmName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<startResponse>}
-   */
-  start(resourceGroupName, vmName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .start(resourceGroupName, vmName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the powerOff function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vmName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<powerOffResponse>}
-   */
-  stop(resourceGroupName, vmName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .powerOff(resourceGroupName, vmName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the restart function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vmName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<restartResponse>}
-   */
-  reboot(resourceGroupName, vmName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .restart(resourceGroupName, vmName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vmName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  destroy(resourceGroupName, vmName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.virtualMachines
-            .deleteMethod(resourceGroupName, vmName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vmName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(resourceGroupName, vmName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.createOrUpdate(
+							resourceGroupName,
+							vmName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	list(resourceGroupName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.list(resourceGroupName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the start function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vmName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<startResponse>}
+	 */
+	start(resourceGroupName, vmName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.start(resourceGroupName, vmName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the powerOff function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vmName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<powerOffResponse>}
+	 */
+	stop(resourceGroupName, vmName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.powerOff(resourceGroupName, vmName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the restart function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vmName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<restartResponse>}
+	 */
+	reboot(resourceGroupName, vmName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.restart(resourceGroupName, vmName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vmName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	destroy(resourceGroupName, vmName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.virtualMachines
+						.deleteMethod(resourceGroupName, vmName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_ComputeInstance;
diff --git a/generator/generatedClasses/Azure/compute/azure-container.js b/generator/generatedClasses/Azure/compute/azure-container.js
index 14991423..f27e4286 100644
--- a/generator/generatedClasses/Azure/compute/azure-container.js
+++ b/generator/generatedClasses/Azure/compute/azure-container.js
@@ -1,147 +1,151 @@
-const { ContainerServiceClient } = require("@azure/arm-containerservice");
+const { ContainerServiceClient } = require('@azure/arm-containerservice');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Container object
  * @category Azure
  */
 class Azure_Container {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} containerServiceName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(
-    resourceGroupName,
-    containerServiceName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.containerServices
-            .createOrUpdate(
-              resourceGroupName,
-              containerServiceName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} containerServiceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, containerServiceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.containerServices
-            .deleteMethod(resourceGroupName, containerServiceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} containerServiceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describe(resourceGroupName, containerServiceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.containerServices
-            .get(resourceGroupName, containerServiceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of containerservice
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  list(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.containerServices.list(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} containerServiceName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(
+		resourceGroupName,
+		containerServiceName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.containerServices
+						.createOrUpdate(
+							resourceGroupName,
+							containerServiceName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} containerServiceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, containerServiceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.containerServices
+						.deleteMethod(
+							resourceGroupName,
+							containerServiceName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} containerServiceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describe(resourceGroupName, containerServiceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.containerServices
+						.get(resourceGroupName, containerServiceName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of containerservice
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	list(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.containerServices.list(options).then(result => {
+						resolve(result);
+					});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_Container;
diff --git a/generator/generatedClasses/Azure/compute/azure-kubernetes.js b/generator/generatedClasses/Azure/compute/azure-kubernetes.js
index 3e5f50a2..9ce5157f 100644
--- a/generator/generatedClasses/Azure/compute/azure-kubernetes.js
+++ b/generator/generatedClasses/Azure/compute/azure-kubernetes.js
@@ -1,360 +1,379 @@
-const { ContainerServiceClient } = require("@azure/arm-containerservice");
+const { ContainerServiceClient } = require('@azure/arm-containerservice');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Kubernetes object
  * @category Azure
  */
 class Azure_Kubernetes {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(resourceGroupName, resourceName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters
-            .createOrUpdate(
-              resourceGroupName,
-              resourceName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, resourceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters
-            .deleteMethod(resourceGroupName, resourceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateTags function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateTagsResponse>}
-   */
-  updateTags(resourceGroupName, resourceName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters
-            .updateTags(resourceGroupName, resourceName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of containerservice
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  listClusters(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters.list(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describeCluster(resourceGroupName, resourceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters
-            .get(resourceGroupName, resourceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createOrUpdate function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {StringKeyword} agentPoolName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createNodeGroup(
-    resourceGroupName,
-    resourceName,
-    agentPoolName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.agentPools
-            .createOrUpdate(
-              resourceGroupName,
-              resourceName,
-              agentPoolName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {StringKeyword} agentPoolName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  deleteNodegroup(
-    resourceGroupName,
-    resourceName,
-    agentPoolName,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.agentPools
-            .deleteMethod(
-              resourceGroupName,
-              resourceName,
-              agentPoolName,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {StringKeyword} agentPoolName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describeNodeGroup(
-    resourceGroupName,
-    resourceName,
-    agentPoolName,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.agentPools
-            .get(resourceGroupName, resourceName, agentPoolName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  listNodegroups(resourceGroupName, resourceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.agentPools
-            .list(resourceGroupName, resourceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the rotateClusterCertificates function of containerservice
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} resourceName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<rotateClusterCertificatesResponse>}
-   */
-  updateConfig(resourceGroupName, resourceName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ContainerServiceClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedClusters
-            .rotateClusterCertificates(resourceGroupName, resourceName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(resourceGroupName, resourceName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters
+						.createOrUpdate(
+							resourceGroupName,
+							resourceName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, resourceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters
+						.deleteMethod(resourceGroupName, resourceName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateTags function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateTagsResponse>}
+	 */
+	updateTags(
+		resourceGroupName,
+		resourceName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters
+						.updateTags(
+							resourceGroupName,
+							resourceName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of containerservice
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	listClusters(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters.list(options).then(result => {
+						resolve(result);
+					});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describeCluster(resourceGroupName, resourceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters
+						.get(resourceGroupName, resourceName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createOrUpdate function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {StringKeyword} agentPoolName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createNodeGroup(
+		resourceGroupName,
+		resourceName,
+		agentPoolName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.agentPools
+						.createOrUpdate(
+							resourceGroupName,
+							resourceName,
+							agentPoolName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {StringKeyword} agentPoolName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	deleteNodegroup(
+		resourceGroupName,
+		resourceName,
+		agentPoolName,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.agentPools
+						.deleteMethod(
+							resourceGroupName,
+							resourceName,
+							agentPoolName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {StringKeyword} agentPoolName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describeNodeGroup(
+		resourceGroupName,
+		resourceName,
+		agentPoolName,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.agentPools
+						.get(
+							resourceGroupName,
+							resourceName,
+							agentPoolName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	listNodegroups(resourceGroupName, resourceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.agentPools
+						.list(resourceGroupName, resourceName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the rotateClusterCertificates function of containerservice
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} resourceName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<rotateClusterCertificatesResponse>}
+	 */
+	updateConfig(resourceGroupName, resourceName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ContainerServiceClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedClusters
+						.rotateClusterCertificates(
+							resourceGroupName,
+							resourceName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_Kubernetes;
diff --git a/generator/generatedClasses/Azure/database/azure-RDBMS.js b/generator/generatedClasses/Azure/database/azure-RDBMS.js
index 8767d939..d4d7d062 100644
--- a/generator/generatedClasses/Azure/database/azure-RDBMS.js
+++ b/generator/generatedClasses/Azure/database/azure-RDBMS.js
@@ -1,233 +1,238 @@
-const { SqlManagementClient } = require("@azure/arm-sql");
+const { SqlManagementClient } = require('@azure/arm-sql');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a RDBMS object
  * @category Azure
  */
 class Azure_RDBMS {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of sql
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} serverName - Mandatory parameter
-   * @param {StringKeyword} databaseName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createDatabse(
-    resourceGroupName,
-    serverName,
-    databaseName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new SqlManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.databases
-            .createOrUpdate(
-              resourceGroupName,
-              serverName,
-              databaseName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of sql
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} serverName - Mandatory parameter
-   * @param {StringKeyword} databaseName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  deleteDatabase(
-    resourceGroupName,
-    serverName,
-    databaseName,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new SqlManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.databases
-            .deleteMethod(resourceGroupName, serverName, databaseName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the exportMethod function of sql
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} serverName - Mandatory parameter
-   * @param {StringKeyword} databaseName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<exportMethodResponse>}
-   */
-  createSnapshots(
-    resourceGroupName,
-    serverName,
-    databaseName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new SqlManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.databases
-            .exportMethod(
-              resourceGroupName,
-              serverName,
-              databaseName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of sql
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} serverName - Mandatory parameter
-   * @param {StringKeyword} databaseName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  modifyDB(
-    resourceGroupName,
-    serverName,
-    databaseName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new SqlManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.databases
-            .update(
-              resourceGroupName,
-              serverName,
-              databaseName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the completeRestore function of sql
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} managedInstanceName - Mandatory parameter
-   * @param {StringKeyword} databaseName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<completeRestoreResponse>}
-   */
-  restoreDatabase(
-    resourceGroupName,
-    managedInstanceName,
-    databaseName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new SqlManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.managedDatabases
-            .completeRestore(
-              resourceGroupName,
-              managedInstanceName,
-              databaseName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of sql
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} serverName - Mandatory parameter
+	 * @param {StringKeyword} databaseName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createDatabse(
+		resourceGroupName,
+		serverName,
+		databaseName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new SqlManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.databases
+						.createOrUpdate(
+							resourceGroupName,
+							serverName,
+							databaseName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of sql
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} serverName - Mandatory parameter
+	 * @param {StringKeyword} databaseName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	deleteDatabase(
+		resourceGroupName,
+		serverName,
+		databaseName,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new SqlManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.databases
+						.deleteMethod(
+							resourceGroupName,
+							serverName,
+							databaseName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the exportMethod function of sql
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} serverName - Mandatory parameter
+	 * @param {StringKeyword} databaseName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<exportMethodResponse>}
+	 */
+	createSnapshots(
+		resourceGroupName,
+		serverName,
+		databaseName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new SqlManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.databases
+						.exportMethod(
+							resourceGroupName,
+							serverName,
+							databaseName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of sql
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} serverName - Mandatory parameter
+	 * @param {StringKeyword} databaseName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	modifyDB(
+		resourceGroupName,
+		serverName,
+		databaseName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new SqlManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.databases
+						.update(
+							resourceGroupName,
+							serverName,
+							databaseName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the completeRestore function of sql
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} managedInstanceName - Mandatory parameter
+	 * @param {StringKeyword} databaseName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<completeRestoreResponse>}
+	 */
+	restoreDatabase(
+		resourceGroupName,
+		managedInstanceName,
+		databaseName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new SqlManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.managedDatabases
+						.completeRestore(
+							resourceGroupName,
+							managedInstanceName,
+							databaseName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_RDBMS;
diff --git a/generator/generatedClasses/Azure/database/azure-noSql.js b/generator/generatedClasses/Azure/database/azure-noSql.js
index c59fe9dd..70b2d295 100644
--- a/generator/generatedClasses/Azure/database/azure-noSql.js
+++ b/generator/generatedClasses/Azure/database/azure-noSql.js
@@ -1,211 +1,221 @@
-const { CosmosDBManagementClient } = require("@azure/arm-cosmosdb");
+const { CosmosDBManagementClient } = require('@azure/arm-cosmosdb');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a NoSql object
  * @category Azure
  */
 class Azure_NoSql {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createUpdateTable function of cosmosdb
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} tableName - Mandatory parameter
-   * @param {TypeReference} createUpdateTableParameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createUpdateTableResponse>}
-   */
-  createCollection(
-    resourceGroupName,
-    accountName,
-    tableName,
-    createUpdateTableParameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new CosmosDBManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.tableResources
-            .createUpdateTable(
-              resourceGroupName,
-              accountName,
-              tableName,
-              createUpdateTableParameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteTable function of cosmosdb
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} tableName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteTableResponse>}
-   */
-  deleteCollection(
-    resourceGroupName,
-    accountName,
-    tableName,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new CosmosDBManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.tableResources
-            .deleteTable(resourceGroupName, accountName, tableName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listTables function of cosmosdb
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listTablesResponse>}
-   */
-  listCollections(resourceGroupName, accountName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new CosmosDBManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.tableResources
-            .listTables(resourceGroupName, accountName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateTableThroughput function of cosmosdb
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} tableName - Mandatory parameter
-   * @param {TypeReference} updateThroughputParameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateTableThroughputResponse>}
-   */
-  setAttribute(
-    resourceGroupName,
-    accountName,
-    tableName,
-    updateThroughputParameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new CosmosDBManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.tableResources
-            .updateTableThroughput(
-              resourceGroupName,
-              accountName,
-              tableName,
-              updateThroughputParameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getTable function of cosmosdb
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} tableName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getTableResponse>}
-   */
-  getAttributes(
-    resourceGroupName,
-    accountName,
-    tableName,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new CosmosDBManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.tableResources
-            .getTable(resourceGroupName, accountName, tableName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createUpdateTable function of cosmosdb
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} tableName - Mandatory parameter
+	 * @param {TypeReference} createUpdateTableParameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createUpdateTableResponse>}
+	 */
+	createCollection(
+		resourceGroupName,
+		accountName,
+		tableName,
+		createUpdateTableParameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new CosmosDBManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.tableResources
+						.createUpdateTable(
+							resourceGroupName,
+							accountName,
+							tableName,
+							createUpdateTableParameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteTable function of cosmosdb
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} tableName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteTableResponse>}
+	 */
+	deleteCollection(
+		resourceGroupName,
+		accountName,
+		tableName,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new CosmosDBManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.tableResources
+						.deleteTable(
+							resourceGroupName,
+							accountName,
+							tableName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listTables function of cosmosdb
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listTablesResponse>}
+	 */
+	listCollections(resourceGroupName, accountName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new CosmosDBManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.tableResources
+						.listTables(resourceGroupName, accountName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateTableThroughput function of cosmosdb
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} tableName - Mandatory parameter
+	 * @param {TypeReference} updateThroughputParameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateTableThroughputResponse>}
+	 */
+	setAttribute(
+		resourceGroupName,
+		accountName,
+		tableName,
+		updateThroughputParameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new CosmosDBManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.tableResources
+						.updateTableThroughput(
+							resourceGroupName,
+							accountName,
+							tableName,
+							updateThroughputParameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getTable function of cosmosdb
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} tableName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getTableResponse>}
+	 */
+	getAttributes(
+		resourceGroupName,
+		accountName,
+		tableName,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new CosmosDBManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.tableResources
+						.getTable(
+							resourceGroupName,
+							accountName,
+							tableName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_NoSql;
diff --git a/generator/generatedClasses/Azure/management/azure-keyManagement.js b/generator/generatedClasses/Azure/management/azure-keyManagement.js
index 2a6a8316..ef080569 100644
--- a/generator/generatedClasses/Azure/management/azure-keyManagement.js
+++ b/generator/generatedClasses/Azure/management/azure-keyManagement.js
@@ -1,187 +1,197 @@
-const { KeyVaultManagementClient } = require("@azure/arm-keyvault");
+const { KeyVaultManagementClient } = require('@azure/arm-keyvault');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a KeyManagement object
  * @category Azure
  */
 class Azure_KeyManagement {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of keyvault
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vaultName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createKey(resourceGroupName, vaultName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new KeyVaultManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.vaults
-            .createOrUpdate(resourceGroupName, vaultName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of keyvault
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vaultName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  deleteKey(resourceGroupName, vaultName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new KeyVaultManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.vaults
-            .deleteMethod(resourceGroupName, vaultName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of keyvault
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vaultName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  update(resourceGroupName, vaultName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new KeyVaultManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.vaults
-            .update(resourceGroupName, vaultName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of keyvault
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vaultName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describeKey(resourceGroupName, vaultName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new KeyVaultManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.vaults
-            .get(resourceGroupName, vaultName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateAccessPolicy function of keyvault
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} vaultName - Mandatory parameter
-   * @param {TypeReference} operationKind - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateAccessPolicyResponse>}
-   */
-  putKeyPolicy(
-    resourceGroupName,
-    vaultName,
-    operationKind,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new KeyVaultManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.vaults
-            .updateAccessPolicy(
-              resourceGroupName,
-              vaultName,
-              operationKind,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of keyvault
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vaultName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createKey(resourceGroupName, vaultName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new KeyVaultManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.vaults
+						.createOrUpdate(
+							resourceGroupName,
+							vaultName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of keyvault
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vaultName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	deleteKey(resourceGroupName, vaultName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new KeyVaultManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.vaults
+						.deleteMethod(resourceGroupName, vaultName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of keyvault
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vaultName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	update(resourceGroupName, vaultName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new KeyVaultManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.vaults
+						.update(
+							resourceGroupName,
+							vaultName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of keyvault
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vaultName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describeKey(resourceGroupName, vaultName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new KeyVaultManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.vaults
+						.get(resourceGroupName, vaultName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateAccessPolicy function of keyvault
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} vaultName - Mandatory parameter
+	 * @param {TypeReference} operationKind - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateAccessPolicyResponse>}
+	 */
+	putKeyPolicy(
+		resourceGroupName,
+		vaultName,
+		operationKind,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new KeyVaultManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.vaults
+						.updateAccessPolicy(
+							resourceGroupName,
+							vaultName,
+							operationKind,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_KeyManagement;
diff --git a/generator/generatedClasses/Azure/management/azure-monitoring.js b/generator/generatedClasses/Azure/management/azure-monitoring.js
index f365ad1d..efb43c1f 100644
--- a/generator/generatedClasses/Azure/management/azure-monitoring.js
+++ b/generator/generatedClasses/Azure/management/azure-monitoring.js
@@ -1,174 +1,186 @@
-const { MonitorManagementClient } = require("@azure/arm-monitor");
+const { MonitorManagementClient } = require('@azure/arm-monitor');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Monitoring object
  * @category Azure
  */
 class Azure_Monitoring {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of monitor
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} ruleName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createAlarm(resourceGroupName, ruleName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new MonitorManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.alertRules
-            .createOrUpdate(resourceGroupName, ruleName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of monitor
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} ruleName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  deleteAlarm(resourceGroupName, ruleName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new MonitorManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.alertRules
-            .deleteMethod(resourceGroupName, ruleName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of monitor
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} ruleName - Mandatory parameter
-   * @param {TypeReference} alertRulesResource - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  updateAlarm(
-    resourceGroupName,
-    ruleName,
-    alertRulesResource,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new MonitorManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.alertRules
-            .update(resourceGroupName, ruleName, alertRulesResource, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listBySubscription function of monitor
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listBySubscriptionResponse>}
-   */
-  listAlarms(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new MonitorManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.alertRules.listBySubscription(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of monitor
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} ruleName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  getMetricData(resourceGroupName, ruleName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new MonitorManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.alertRules
-            .get(resourceGroupName, ruleName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of monitor
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} ruleName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createAlarm(resourceGroupName, ruleName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new MonitorManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.alertRules
+						.createOrUpdate(
+							resourceGroupName,
+							ruleName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of monitor
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} ruleName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	deleteAlarm(resourceGroupName, ruleName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new MonitorManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.alertRules
+						.deleteMethod(resourceGroupName, ruleName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of monitor
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} ruleName - Mandatory parameter
+	 * @param {TypeReference} alertRulesResource - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	updateAlarm(
+		resourceGroupName,
+		ruleName,
+		alertRulesResource,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new MonitorManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.alertRules
+						.update(
+							resourceGroupName,
+							ruleName,
+							alertRulesResource,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listBySubscription function of monitor
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listBySubscriptionResponse>}
+	 */
+	listAlarms(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new MonitorManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.alertRules
+						.listBySubscription(options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of monitor
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} ruleName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	getMetricData(resourceGroupName, ruleName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new MonitorManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.alertRules
+						.get(resourceGroupName, ruleName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_Monitoring;
diff --git a/generator/generatedClasses/Azure/network/azure-DNS.js b/generator/generatedClasses/Azure/network/azure-DNS.js
index 9e52b9cb..38ae476b 100644
--- a/generator/generatedClasses/Azure/network/azure-DNS.js
+++ b/generator/generatedClasses/Azure/network/azure-DNS.js
@@ -1,154 +1,159 @@
-const { DnsManagementClient } = require("@azure/arm-dns");
+const { DnsManagementClient } = require('@azure/arm-dns');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a DNS object
  * @category Azure
  */
 class Azure_DNS {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of dns
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} zoneName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  createZone(resourceGroupName, zoneName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new DnsManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.zones
-            .createOrUpdate(resourceGroupName, zoneName, parameters, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of dns
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} zoneName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  deleteZone(resourceGroupName, zoneName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new DnsManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.zones
-            .deleteMethod(resourceGroupName, zoneName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of dns
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  listZones(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new DnsManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.zones.list(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createOrUpdate function of dns
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} zoneName - Mandatory parameter
-   * @param {StringKeyword} relativeRecordSetName - Mandatory parameter
-   * @param {TypeReference} recordType - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  changeRecordSets(
-    resourceGroupName,
-    zoneName,
-    relativeRecordSetName,
-    recordType,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new DnsManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.recordSets
-            .createOrUpdate(
-              resourceGroupName,
-              zoneName,
-              relativeRecordSetName,
-              recordType,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of dns
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} zoneName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	createZone(resourceGroupName, zoneName, parameters, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new DnsManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.zones
+						.createOrUpdate(
+							resourceGroupName,
+							zoneName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of dns
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} zoneName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	deleteZone(resourceGroupName, zoneName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new DnsManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.zones
+						.deleteMethod(resourceGroupName, zoneName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of dns
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	listZones(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new DnsManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.zones.list(options).then(result => {
+						resolve(result);
+					});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createOrUpdate function of dns
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} zoneName - Mandatory parameter
+	 * @param {StringKeyword} relativeRecordSetName - Mandatory parameter
+	 * @param {TypeReference} recordType - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	changeRecordSets(
+		resourceGroupName,
+		zoneName,
+		relativeRecordSetName,
+		recordType,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new DnsManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.recordSets
+						.createOrUpdate(
+							resourceGroupName,
+							zoneName,
+							relativeRecordSetName,
+							recordType,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_DNS;
diff --git a/generator/generatedClasses/Azure/network/azure-loadBalancer.js b/generator/generatedClasses/Azure/network/azure-loadBalancer.js
index 437a80c8..db3ae534 100644
--- a/generator/generatedClasses/Azure/network/azure-loadBalancer.js
+++ b/generator/generatedClasses/Azure/network/azure-loadBalancer.js
@@ -1,185 +1,196 @@
-const { NetworkManagementClient } = require("@azure/arm-network");
+const { NetworkManagementClient } = require('@azure/arm-network');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a LoadBalancer object
  * @category Azure
  */
 class Azure_LoadBalancer {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of network
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} loadBalancerName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(resourceGroupName, loadBalancerName, parameters, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new NetworkManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.loadBalancers
-            .createOrUpdate(
-              resourceGroupName,
-              loadBalancerName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of network
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} loadBalancerName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, loadBalancerName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new NetworkManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.loadBalancers
-            .deleteMethod(resourceGroupName, loadBalancerName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of network
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  list(resourceGroupName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new NetworkManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.loadBalancers.list(resourceGroupName, options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateTags function of network
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} loadBalancerName - Mandatory parameter
-   * @param {TypeReference} parameters - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateTagsResponse>}
-   */
-  addTags(
-    resourceGroupName,
-    loadBalancerName,
-    parameters,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new NetworkManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.loadBalancers
-            .updateTags(
-              resourceGroupName,
-              loadBalancerName,
-              parameters,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of network
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} loadBalancerName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describe(resourceGroupName, loadBalancerName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new NetworkManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.loadBalancers
-            .get(resourceGroupName, loadBalancerName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of network
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} loadBalancerName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(
+		resourceGroupName,
+		loadBalancerName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new NetworkManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.loadBalancers
+						.createOrUpdate(
+							resourceGroupName,
+							loadBalancerName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of network
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} loadBalancerName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, loadBalancerName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new NetworkManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.loadBalancers
+						.deleteMethod(
+							resourceGroupName,
+							loadBalancerName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of network
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	list(resourceGroupName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new NetworkManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.loadBalancers
+						.list(resourceGroupName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateTags function of network
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} loadBalancerName - Mandatory parameter
+	 * @param {TypeReference} parameters - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateTagsResponse>}
+	 */
+	addTags(
+		resourceGroupName,
+		loadBalancerName,
+		parameters,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new NetworkManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.loadBalancers
+						.updateTags(
+							resourceGroupName,
+							loadBalancerName,
+							parameters,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of network
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} loadBalancerName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describe(resourceGroupName, loadBalancerName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new NetworkManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.loadBalancers
+						.get(resourceGroupName, loadBalancerName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_LoadBalancer;
diff --git a/generator/generatedClasses/Azure/storage/azure-blockStorage.js b/generator/generatedClasses/Azure/storage/azure-blockStorage.js
index 638df80b..a792ee41 100644
--- a/generator/generatedClasses/Azure/storage/azure-blockStorage.js
+++ b/generator/generatedClasses/Azure/storage/azure-blockStorage.js
@@ -1,169 +1,174 @@
-const { ComputeManagementClient } = require("@azure/arm-compute");
+const { ComputeManagementClient } = require('@azure/arm-compute');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a BlockStorage object
  * @category Azure
  */
 class Azure_BlockStorage {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the createOrUpdate function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} diskName - Mandatory parameter
-   * @param {TypeReference} disk - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createOrUpdateResponse>}
-   */
-  create(resourceGroupName, diskName, disk, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.disks
-            .createOrUpdate(resourceGroupName, diskName, disk, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} diskName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, diskName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.disks
-            .deleteMethod(resourceGroupName, diskName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the get function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} diskName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getResponse>}
-   */
-  describe(resourceGroupName, diskName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.disks
-            .get(resourceGroupName, diskName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of compute
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  list(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.disks.list(options).then(result => {
-            resolve(result);
-          });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the update function of compute
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} diskName - Mandatory parameter
-   * @param {TypeReference} disk - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<updateResponse>}
-   */
-  update(resourceGroupName, diskName, disk, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new ComputeManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.disks
-            .update(resourceGroupName, diskName, disk, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the createOrUpdate function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} diskName - Mandatory parameter
+	 * @param {TypeReference} disk - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createOrUpdateResponse>}
+	 */
+	create(resourceGroupName, diskName, disk, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.disks
+						.createOrUpdate(
+							resourceGroupName,
+							diskName,
+							disk,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} diskName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, diskName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.disks
+						.deleteMethod(resourceGroupName, diskName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the get function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} diskName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getResponse>}
+	 */
+	describe(resourceGroupName, diskName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.disks
+						.get(resourceGroupName, diskName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of compute
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	list(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.disks.list(options).then(result => {
+						resolve(result);
+					});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the update function of compute
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} diskName - Mandatory parameter
+	 * @param {TypeReference} disk - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<updateResponse>}
+	 */
+	update(resourceGroupName, diskName, disk, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new ComputeManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.disks
+						.update(resourceGroupName, diskName, disk, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_BlockStorage;
diff --git a/generator/generatedClasses/Azure/storage/azure-storageBucket.js b/generator/generatedClasses/Azure/storage/azure-storageBucket.js
index b060e6fc..fd7c99ec 100644
--- a/generator/generatedClasses/Azure/storage/azure-storageBucket.js
+++ b/generator/generatedClasses/Azure/storage/azure-storageBucket.js
@@ -1,129 +1,129 @@
-const { StorageManagementClient } = require("@azure/arm-storage");
+const { StorageManagementClient } = require('@azure/arm-storage');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a StorageBucket object
  * @category Azure
  */
 class Azure_StorageBucket {
-  /**
-   *
-   * @param {module} azureRestSdk Azure Rest SDK
-   */
-  constructor(azureRestSdk) {
-    this._azureRestSdk = azureRestSdk;
-  }
-  /**
-   * Trigers the create function of storage
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} containerName - Mandatory parameter
-   * @param {TypeReference} blobContainer - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<createResponse>}
-   */
-  create(
-    resourceGroupName,
-    accountName,
-    containerName,
-    blobContainer,
-    options = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new StorageManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.blobContainers
-            .create(
-              resourceGroupName,
-              accountName,
-              containerName,
-              blobContainer,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteMethod function of storage
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {StringKeyword} containerName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteMethodResponse>}
-   */
-  delete(resourceGroupName, accountName, containerName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new StorageManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.blobContainers
-            .deleteMethod(
-              resourceGroupName,
-              accountName,
-              containerName,
-              options
-            )
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the list function of storage
-   * @param {StringKeyword} resourceGroupName - Mandatory parameter
-   * @param {StringKeyword} accountName - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<listResponse>}
-   */
-  list(resourceGroupName, accountName, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._azureRestSdk
-        .loginWithServicePrincipalSecretWithAuthResponse(
-          process.env.AZURE_CLIENT_ID,
-          process.env.AZURE_CLIENT_SECRET,
-          process.env.AZURE_TENANT_ID
-        )
-        .then(authres => {
-          const client = new StorageManagementClient(
-            authres.credentials,
-            process.env.AZURE_SUBSCRIPTION_ID
-          );
-          client.blobContainers
-            .list(resourceGroupName, accountName, options)
-            .then(result => {
-              resolve(result);
-            });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {module} azureRestSdk Azure Rest SDK
+	 */
+	constructor(azureRestSdk) {
+		this._azureRestSdk = azureRestSdk;
+	}
+	/**
+	 * Trigers the create function of storage
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} containerName - Mandatory parameter
+	 * @param {TypeReference} blobContainer - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<createResponse>}
+	 */
+	create(
+		resourceGroupName,
+		accountName,
+		containerName,
+		blobContainer,
+		options = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new StorageManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.blobContainers
+						.create(
+							resourceGroupName,
+							accountName,
+							containerName,
+							blobContainer,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteMethod function of storage
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {StringKeyword} containerName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteMethodResponse>}
+	 */
+	delete(resourceGroupName, accountName, containerName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new StorageManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.blobContainers
+						.deleteMethod(
+							resourceGroupName,
+							accountName,
+							containerName,
+							options
+						)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the list function of storage
+	 * @param {StringKeyword} resourceGroupName - Mandatory parameter
+	 * @param {StringKeyword} accountName - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<listResponse>}
+	 */
+	list(resourceGroupName, accountName, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._azureRestSdk
+				.loginWithServicePrincipalSecretWithAuthResponse(
+					process.env.AZURE_CLIENT_ID,
+					process.env.AZURE_CLIENT_SECRET,
+					process.env.AZURE_TENANT_ID
+				)
+				.then(authres => {
+					const client = new StorageManagementClient(
+						authres.credentials,
+						process.env.AZURE_SUBSCRIPTION_ID
+					);
+					client.blobContainers
+						.list(resourceGroupName, accountName, options)
+						.then(result => {
+							resolve(result);
+						});
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = Azure_StorageBucket;
diff --git a/generator/generatedClasses/DO/compute/do-computeInstance.js b/generator/generatedClasses/DO/compute/do-computeInstance.js
index 7f925773..593c3b85 100644
--- a/generator/generatedClasses/DO/compute/do-computeInstance.js
+++ b/generator/generatedClasses/DO/compute/do-computeInstance.js
@@ -4,76 +4,76 @@
  * @category Digital Ocean
  */
 class DO_ComputeInstance {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._droplets = this._instance.droplets;
-  }
-  /**
-   * Trigers the getAll function of Droplets
-   * @param {StringKeyword} tagName - Data required for getAll
-   * @param {BooleanKeyword} includeAll - Data required for getAll
-   * @param {NumberKeyword} page - Data required for getAll
-   * @param {NumberKeyword} pageSize - Data required for getAll
-   * @returns {Promise<getAllResponse>}
-   */
-  list(
-    tagName,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._droplets
-        .getAll(tagName, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the create function of Droplets
-   * @param {DropletCreationRequest} options - Data required for create
-   * @returns {Promise<createResponse>}
-   */
-  create(options) {
-    return new Promise((resolve, reject) => {
-      this._droplets
-        .create(options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the deleteById function of Droplets
-   * @param {StringKeyword} dropletId - Data required for deleteById
-   * @returns {Promise<deleteByIdResponse>}
-   */
-  destroy(dropletId) {
-    return new Promise((resolve, reject) => {
-      this._droplets
-        .deleteById(dropletId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the requestAction function of Droplets
-   * @param {StringKeyword} dropletId - Data required for requestAction
-   * @param {AnyKeyword} action - Data required for requestAction
-   * @returns {Promise<requestActionResponse>}
-   */
-  stop(dropletId, action) {
-    return new Promise((resolve, reject) => {
-      this._droplets
-        .requestAction(dropletId, action)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._droplets = this._instance.droplets;
+	}
+	/**
+	 * Trigers the getAll function of Droplets
+	 * @param {StringKeyword} tagName - Data required for getAll
+	 * @param {BooleanKeyword} includeAll - Data required for getAll
+	 * @param {NumberKeyword} page - Data required for getAll
+	 * @param {NumberKeyword} pageSize - Data required for getAll
+	 * @returns {Promise<getAllResponse>}
+	 */
+	list(
+		tagName,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._droplets
+				.getAll(tagName, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the create function of Droplets
+	 * @param {DropletCreationRequest} options - Data required for create
+	 * @returns {Promise<createResponse>}
+	 */
+	create(options) {
+		return new Promise((resolve, reject) => {
+			this._droplets
+				.create(options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteById function of Droplets
+	 * @param {StringKeyword} dropletId - Data required for deleteById
+	 * @returns {Promise<deleteByIdResponse>}
+	 */
+	destroy(dropletId) {
+		return new Promise((resolve, reject) => {
+			this._droplets
+				.deleteById(dropletId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the requestAction function of Droplets
+	 * @param {StringKeyword} dropletId - Data required for requestAction
+	 * @param {AnyKeyword} action - Data required for requestAction
+	 * @returns {Promise<requestActionResponse>}
+	 */
+	stop(dropletId, action) {
+		return new Promise((resolve, reject) => {
+			this._droplets
+				.requestAction(dropletId, action)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_ComputeInstance;
diff --git a/generator/generatedClasses/DO/compute/do-kubernetes.js b/generator/generatedClasses/DO/compute/do-kubernetes.js
index ae3db733..bcf976ed 100644
--- a/generator/generatedClasses/DO/compute/do-kubernetes.js
+++ b/generator/generatedClasses/DO/compute/do-kubernetes.js
@@ -4,132 +4,136 @@
  * @category Digital Ocean
  */
 class DO_Kubernetes {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._kubernetes = this._instance.kubernetes;
-  }
-  /**
-   * Trigers the getClusters function of Kubernetes
-   * @param {BooleanKeyword} includeAll - Data required for getClusters
-   * @param {NumberKeyword} page - Data required for getClusters
-   * @param {NumberKeyword} pageSize - Data required for getClusters
-   * @returns {Promise<getClustersResponse>}
-   */
-  listClusters(includeAll = undefined, page = undefined, pageSize = undefined) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .getClusters(includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the create function of Kubernetes
-   * @param {NewClusterRequest} options - Data required for create
-   * @returns {Promise<createResponse>}
-   */
-  create(options) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .create(options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getById function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for getById
-   * @returns {Promise<getByIdResponse>}
-   */
-  describeCluster(clusterId) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .getById(clusterId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the delete function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for delete
-   * @returns {Promise<deleteResponse>}
-   */
-  delete(clusterId) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .delete(clusterId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getNodePools function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for getNodePools
-   * @param {BooleanKeyword} includeAll - Data required for getNodePools
-   * @param {NumberKeyword} page - Data required for getNodePools
-   * @param {NumberKeyword} pageSize - Data required for getNodePools
-   * @returns {Promise<getNodePoolsResponse>}
-   */
-  listNodegroups(
-    clusterId,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .getNodePools(clusterId, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getNodePoolById function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for getNodePoolById
-   * @param {StringKeyword} nodePoolId - Data required for getNodePoolById
-   * @returns {Promise<getNodePoolByIdResponse>}
-   */
-  describeNodeGroup(clusterId, nodePoolId) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .getNodePoolById(clusterId, nodePoolId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the addNodePool function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for addNodePool
-   * @param {ClusterNodePool} nodePool - Data required for addNodePool
-   * @returns {Promise<addNodePoolResponse>}
-   */
-  createNodeGroup(clusterId, nodePool) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .addNodePool(clusterId, nodePool)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the deleteNodePool function of Kubernetes
-   * @param {StringKeyword} clusterId - Data required for deleteNodePool
-   * @param {StringKeyword} nodePoolId - Data required for deleteNodePool
-   * @returns {Promise<deleteNodePoolResponse>}
-   */
-  deleteNodegroup(clusterId, nodePoolId) {
-    return new Promise((resolve, reject) => {
-      this._kubernetes
-        .deleteNodePool(clusterId, nodePoolId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._kubernetes = this._instance.kubernetes;
+	}
+	/**
+	 * Trigers the getClusters function of Kubernetes
+	 * @param {BooleanKeyword} includeAll - Data required for getClusters
+	 * @param {NumberKeyword} page - Data required for getClusters
+	 * @param {NumberKeyword} pageSize - Data required for getClusters
+	 * @returns {Promise<getClustersResponse>}
+	 */
+	listClusters(
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.getClusters(includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the create function of Kubernetes
+	 * @param {NewClusterRequest} options - Data required for create
+	 * @returns {Promise<createResponse>}
+	 */
+	create(options) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.create(options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getById function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for getById
+	 * @returns {Promise<getByIdResponse>}
+	 */
+	describeCluster(clusterId) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.getById(clusterId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the delete function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for delete
+	 * @returns {Promise<deleteResponse>}
+	 */
+	delete(clusterId) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.delete(clusterId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getNodePools function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for getNodePools
+	 * @param {BooleanKeyword} includeAll - Data required for getNodePools
+	 * @param {NumberKeyword} page - Data required for getNodePools
+	 * @param {NumberKeyword} pageSize - Data required for getNodePools
+	 * @returns {Promise<getNodePoolsResponse>}
+	 */
+	listNodegroups(
+		clusterId,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.getNodePools(clusterId, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getNodePoolById function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for getNodePoolById
+	 * @param {StringKeyword} nodePoolId - Data required for getNodePoolById
+	 * @returns {Promise<getNodePoolByIdResponse>}
+	 */
+	describeNodeGroup(clusterId, nodePoolId) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.getNodePoolById(clusterId, nodePoolId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the addNodePool function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for addNodePool
+	 * @param {ClusterNodePool} nodePool - Data required for addNodePool
+	 * @returns {Promise<addNodePoolResponse>}
+	 */
+	createNodeGroup(clusterId, nodePool) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.addNodePool(clusterId, nodePool)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteNodePool function of Kubernetes
+	 * @param {StringKeyword} clusterId - Data required for deleteNodePool
+	 * @param {StringKeyword} nodePoolId - Data required for deleteNodePool
+	 * @returns {Promise<deleteNodePoolResponse>}
+	 */
+	deleteNodegroup(clusterId, nodePoolId) {
+		return new Promise((resolve, reject) => {
+			this._kubernetes
+				.deleteNodePool(clusterId, nodePoolId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_Kubernetes;
diff --git a/generator/generatedClasses/DO/database/do-RDBMS.js b/generator/generatedClasses/DO/database/do-RDBMS.js
index 9363be19..216c49fd 100644
--- a/generator/generatedClasses/DO/database/do-RDBMS.js
+++ b/generator/generatedClasses/DO/database/do-RDBMS.js
@@ -4,76 +4,76 @@
  * @category Digital Ocean
  */
 class DO_RDBMS {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._databases = this._instance.databases;
-  }
-  /**
-   * Trigers the getAllClusters function of Databases
-   * @param {StringKeyword} tagName - Data required for getAllClusters
-   * @param {BooleanKeyword} includeAll - Data required for getAllClusters
-   * @param {NumberKeyword} page - Data required for getAllClusters
-   * @param {NumberKeyword} pageSize - Data required for getAllClusters
-   * @returns {Promise<getAllClustersResponse>}
-   */
-  getClusters(
-    tagName,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .getAllClusters(tagName, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the createCluster function of Databases
-   * @param {DatabaseCreateClusterRequest} clusterOptions - Data required for createCluster
-   * @returns {Promise<createClusterResponse>}
-   */
-  createCluster(clusterOptions) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .createCluster(clusterOptions)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getClusterById function of Databases
-   * @param {StringKeyword} clusterId - Data required for getClusterById
-   * @returns {Promise<getClusterByIdResponse>}
-   */
-  getCluster(clusterId) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .getClusterById(clusterId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the resizeCluster function of Databases
-   * @param {StringKeyword} clusterId - Data required for resizeCluster
-   * @param {DatabaseResizeClusterRequest} configuration - Data required for resizeCluster
-   * @returns {Promise<resizeClusterResponse>}
-   */
-  updateCluster(clusterId, configuration) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .resizeCluster(clusterId, configuration)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._databases = this._instance.databases;
+	}
+	/**
+	 * Trigers the getAllClusters function of Databases
+	 * @param {StringKeyword} tagName - Data required for getAllClusters
+	 * @param {BooleanKeyword} includeAll - Data required for getAllClusters
+	 * @param {NumberKeyword} page - Data required for getAllClusters
+	 * @param {NumberKeyword} pageSize - Data required for getAllClusters
+	 * @returns {Promise<getAllClustersResponse>}
+	 */
+	getClusters(
+		tagName,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.getAllClusters(tagName, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the createCluster function of Databases
+	 * @param {DatabaseCreateClusterRequest} clusterOptions - Data required for createCluster
+	 * @returns {Promise<createClusterResponse>}
+	 */
+	createCluster(clusterOptions) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.createCluster(clusterOptions)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getClusterById function of Databases
+	 * @param {StringKeyword} clusterId - Data required for getClusterById
+	 * @returns {Promise<getClusterByIdResponse>}
+	 */
+	getCluster(clusterId) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.getClusterById(clusterId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the resizeCluster function of Databases
+	 * @param {StringKeyword} clusterId - Data required for resizeCluster
+	 * @param {DatabaseResizeClusterRequest} configuration - Data required for resizeCluster
+	 * @returns {Promise<resizeClusterResponse>}
+	 */
+	updateCluster(clusterId, configuration) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.resizeCluster(clusterId, configuration)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_RDBMS;
diff --git a/generator/generatedClasses/DO/database/do-noSql.js b/generator/generatedClasses/DO/database/do-noSql.js
index 808b12d4..1fcbbe5e 100644
--- a/generator/generatedClasses/DO/database/do-noSql.js
+++ b/generator/generatedClasses/DO/database/do-noSql.js
@@ -4,76 +4,76 @@
  * @category Digital Ocean
  */
 class DO_NoSql {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._databases = this._instance.databases;
-  }
-  /**
-   * Trigers the getAllClusters function of Databases
-   * @param {StringKeyword} tagName - Data required for getAllClusters
-   * @param {BooleanKeyword} includeAll - Data required for getAllClusters
-   * @param {NumberKeyword} page - Data required for getAllClusters
-   * @param {NumberKeyword} pageSize - Data required for getAllClusters
-   * @returns {Promise<getAllClustersResponse>}
-   */
-  getClusters(
-    tagName,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .getAllClusters(tagName, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the createCluster function of Databases
-   * @param {DatabaseCreateClusterRequest} clusterOptions - Data required for createCluster
-   * @returns {Promise<createClusterResponse>}
-   */
-  createCluster(clusterOptions) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .createCluster(clusterOptions)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getClusterById function of Databases
-   * @param {StringKeyword} clusterId - Data required for getClusterById
-   * @returns {Promise<getClusterByIdResponse>}
-   */
-  getCluster(clusterId) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .getClusterById(clusterId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the resizeCluster function of Databases
-   * @param {StringKeyword} clusterId - Data required for resizeCluster
-   * @param {DatabaseResizeClusterRequest} configuration - Data required for resizeCluster
-   * @returns {Promise<resizeClusterResponse>}
-   */
-  updateCluster(clusterId, configuration) {
-    return new Promise((resolve, reject) => {
-      this._databases
-        .resizeCluster(clusterId, configuration)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._databases = this._instance.databases;
+	}
+	/**
+	 * Trigers the getAllClusters function of Databases
+	 * @param {StringKeyword} tagName - Data required for getAllClusters
+	 * @param {BooleanKeyword} includeAll - Data required for getAllClusters
+	 * @param {NumberKeyword} page - Data required for getAllClusters
+	 * @param {NumberKeyword} pageSize - Data required for getAllClusters
+	 * @returns {Promise<getAllClustersResponse>}
+	 */
+	getClusters(
+		tagName,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.getAllClusters(tagName, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the createCluster function of Databases
+	 * @param {DatabaseCreateClusterRequest} clusterOptions - Data required for createCluster
+	 * @returns {Promise<createClusterResponse>}
+	 */
+	createCluster(clusterOptions) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.createCluster(clusterOptions)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getClusterById function of Databases
+	 * @param {StringKeyword} clusterId - Data required for getClusterById
+	 * @returns {Promise<getClusterByIdResponse>}
+	 */
+	getCluster(clusterId) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.getClusterById(clusterId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the resizeCluster function of Databases
+	 * @param {StringKeyword} clusterId - Data required for resizeCluster
+	 * @param {DatabaseResizeClusterRequest} configuration - Data required for resizeCluster
+	 * @returns {Promise<resizeClusterResponse>}
+	 */
+	updateCluster(clusterId, configuration) {
+		return new Promise((resolve, reject) => {
+			this._databases
+				.resizeCluster(clusterId, configuration)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_NoSql;
diff --git a/generator/generatedClasses/DO/management/do-keyManagement.js b/generator/generatedClasses/DO/management/do-keyManagement.js
index ec2921ee..5af44abb 100644
--- a/generator/generatedClasses/DO/management/do-keyManagement.js
+++ b/generator/generatedClasses/DO/management/do-keyManagement.js
@@ -4,75 +4,75 @@
  * @category Digital Ocean
  */
 class DO_KeyManagement {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._keys = this._instance.keys;
-  }
-  /**
-   * Trigers the getAll function of Keys
-   * @param {StringKeyword} tagName - Data required for getAll
-   * @param {BooleanKeyword} includeAll - Data required for getAll
-   * @param {NumberKeyword} page - Data required for getAll
-   * @param {NumberKeyword} pageSize - Data required for getAll
-   * @returns {Promise<getAllResponse>}
-   */
-  list(
-    tagName,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._keys
-        .getAll(tagName, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getById function of Keys
-   * @param {NumberKeyword} keyId - Data required for getById
-   * @returns {Promise<getByIdResponse>}
-   */
-  describeKey(keyId) {
-    return new Promise((resolve, reject) => {
-      this._keys
-        .getById(keyId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the add function of Keys
-   * @param {AddKeyRequest} addKeyRequest - Data required for add
-   * @returns {Promise<addResponse>}
-   */
-  createKey(addKeyRequest) {
-    return new Promise((resolve, reject) => {
-      this._keys
-        .add(addKeyRequest)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the delete function of Keys
-   * @param {StringKeyword} identifier - Data required for delete
-   * @returns {Promise<deleteResponse>}
-   */
-  deleteKey(identifier) {
-    return new Promise((resolve, reject) => {
-      this._keys
-        .delete(identifier)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._keys = this._instance.keys;
+	}
+	/**
+	 * Trigers the getAll function of Keys
+	 * @param {StringKeyword} tagName - Data required for getAll
+	 * @param {BooleanKeyword} includeAll - Data required for getAll
+	 * @param {NumberKeyword} page - Data required for getAll
+	 * @param {NumberKeyword} pageSize - Data required for getAll
+	 * @returns {Promise<getAllResponse>}
+	 */
+	list(
+		tagName,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._keys
+				.getAll(tagName, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getById function of Keys
+	 * @param {NumberKeyword} keyId - Data required for getById
+	 * @returns {Promise<getByIdResponse>}
+	 */
+	describeKey(keyId) {
+		return new Promise((resolve, reject) => {
+			this._keys
+				.getById(keyId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the add function of Keys
+	 * @param {AddKeyRequest} addKeyRequest - Data required for add
+	 * @returns {Promise<addResponse>}
+	 */
+	createKey(addKeyRequest) {
+		return new Promise((resolve, reject) => {
+			this._keys
+				.add(addKeyRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the delete function of Keys
+	 * @param {StringKeyword} identifier - Data required for delete
+	 * @returns {Promise<deleteResponse>}
+	 */
+	deleteKey(identifier) {
+		return new Promise((resolve, reject) => {
+			this._keys
+				.delete(identifier)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_KeyManagement;
diff --git a/generator/generatedClasses/DO/network/do-DNS.js b/generator/generatedClasses/DO/network/do-DNS.js
index 377e3bb7..39ffe53e 100644
--- a/generator/generatedClasses/DO/network/do-DNS.js
+++ b/generator/generatedClasses/DO/network/do-DNS.js
@@ -4,95 +4,95 @@
  * @category Digital Ocean
  */
 class DO_DNS {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._domains = this._instance.domains;
-  }
-  /**
-   * Trigers the getAllRecords function of Domains
-   * @param {StringKeyword} domainName - Data required for getAllRecords
-   * @param {StringKeyword} tagName - Data required for getAllRecords
-   * @param {BooleanKeyword} includeAll - Data required for getAllRecords
-   * @param {NumberKeyword} page - Data required for getAllRecords
-   * @param {NumberKeyword} pageSize - Data required for getAllRecords
-   * @returns {Promise<getAllRecordsResponse>}
-   */
-  getRecords(
-    domainName,
-    tagName,
-    includeAll = undefined,
-    page = undefined,
-    pageSize = undefined
-  ) {
-    return new Promise((resolve, reject) => {
-      this._domains
-        .getAllRecords(domainName, tagName, includeAll, page, pageSize)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the createRecord function of Domains
-   * @param {StringKeyword} domainName - Data required for createRecord
-   * @param {DomainRecordRequestOptions} options - Data required for createRecord
-   * @returns {Promise<createRecordResponse>}
-   */
-  createRecord(domainName, options) {
-    return new Promise((resolve, reject) => {
-      this._domains
-        .createRecord(domainName, options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getRecord function of Domains
-   * @param {StringKeyword} domainName - Data required for getRecord
-   * @param {StringKeyword} recordId - Data required for getRecord
-   * @returns {Promise<getRecordResponse>}
-   */
-  getRecord(domainName, recordId) {
-    return new Promise((resolve, reject) => {
-      this._domains
-        .getRecord(domainName, recordId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the deleteRecord function of Domains
-   * @param {StringKeyword} domainName - Data required for deleteRecord
-   * @param {StringKeyword} recordId - Data required for deleteRecord
-   * @returns {Promise<deleteRecordResponse>}
-   */
-  deleteRecord(domainName, recordId) {
-    return new Promise((resolve, reject) => {
-      this._domains
-        .deleteRecord(domainName, recordId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the updateRecord function of Domains
-   * @param {StringKeyword} domainName - Data required for updateRecord
-   * @param {StringKeyword} recordId - Data required for updateRecord
-   * @param {DomainRecordRequestOptions} options - Data required for updateRecord
-   * @returns {Promise<updateRecordResponse>}
-   */
-  changeRecordSets(domainName, recordId, options) {
-    return new Promise((resolve, reject) => {
-      this._domains
-        .updateRecord(domainName, recordId, options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._domains = this._instance.domains;
+	}
+	/**
+	 * Trigers the getAllRecords function of Domains
+	 * @param {StringKeyword} domainName - Data required for getAllRecords
+	 * @param {StringKeyword} tagName - Data required for getAllRecords
+	 * @param {BooleanKeyword} includeAll - Data required for getAllRecords
+	 * @param {NumberKeyword} page - Data required for getAllRecords
+	 * @param {NumberKeyword} pageSize - Data required for getAllRecords
+	 * @returns {Promise<getAllRecordsResponse>}
+	 */
+	getRecords(
+		domainName,
+		tagName,
+		includeAll = undefined,
+		page = undefined,
+		pageSize = undefined
+	) {
+		return new Promise((resolve, reject) => {
+			this._domains
+				.getAllRecords(domainName, tagName, includeAll, page, pageSize)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the createRecord function of Domains
+	 * @param {StringKeyword} domainName - Data required for createRecord
+	 * @param {DomainRecordRequestOptions} options - Data required for createRecord
+	 * @returns {Promise<createRecordResponse>}
+	 */
+	createRecord(domainName, options) {
+		return new Promise((resolve, reject) => {
+			this._domains
+				.createRecord(domainName, options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getRecord function of Domains
+	 * @param {StringKeyword} domainName - Data required for getRecord
+	 * @param {StringKeyword} recordId - Data required for getRecord
+	 * @returns {Promise<getRecordResponse>}
+	 */
+	getRecord(domainName, recordId) {
+		return new Promise((resolve, reject) => {
+			this._domains
+				.getRecord(domainName, recordId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteRecord function of Domains
+	 * @param {StringKeyword} domainName - Data required for deleteRecord
+	 * @param {StringKeyword} recordId - Data required for deleteRecord
+	 * @returns {Promise<deleteRecordResponse>}
+	 */
+	deleteRecord(domainName, recordId) {
+		return new Promise((resolve, reject) => {
+			this._domains
+				.deleteRecord(domainName, recordId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the updateRecord function of Domains
+	 * @param {StringKeyword} domainName - Data required for updateRecord
+	 * @param {StringKeyword} recordId - Data required for updateRecord
+	 * @param {DomainRecordRequestOptions} options - Data required for updateRecord
+	 * @returns {Promise<updateRecordResponse>}
+	 */
+	changeRecordSets(domainName, recordId, options) {
+		return new Promise((resolve, reject) => {
+			this._domains
+				.updateRecord(domainName, recordId, options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_DNS;
diff --git a/generator/generatedClasses/DO/network/do-loadBalancer.js b/generator/generatedClasses/DO/network/do-loadBalancer.js
index c1d64d0b..665ebb2f 100644
--- a/generator/generatedClasses/DO/network/do-loadBalancer.js
+++ b/generator/generatedClasses/DO/network/do-loadBalancer.js
@@ -4,67 +4,67 @@
  * @category Digital Ocean
  */
 class DO_LoadBalancer {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._loadBalancers = this._instance.loadBalancers;
-  }
-  /**
-   * Trigers the create function of LoadBalancers
-   * @param {LoadBalancerCreationOptions} options - Data required for create
-   * @returns {Promise<createResponse>}
-   */
-  create(options) {
-    return new Promise((resolve, reject) => {
-      this._loadBalancers
-        .create(options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getAll function of LoadBalancers
-   * @returns {Promise<getAllResponse>}
-   */
-  list() {
-    return new Promise((resolve, reject) => {
-      this._loadBalancers
-        .getAll()
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the update function of LoadBalancers
-   * @param {StringKeyword} loadBalancerId - Data required for update
-   * @param {AnyKeyword} options - Data required for update
-   * @returns {Promise<updateResponse>}
-   */
-  update(loadBalancerId, options) {
-    return new Promise((resolve, reject) => {
-      this._loadBalancers
-        .update(loadBalancerId, options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the delete function of LoadBalancers
-   * @param {StringKeyword} loadBalancerId - Data required for delete
-   * @returns {Promise<deleteResponse>}
-   */
-  delete(loadBalancerId) {
-    return new Promise((resolve, reject) => {
-      this._loadBalancers
-        .delete(loadBalancerId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._loadBalancers = this._instance.loadBalancers;
+	}
+	/**
+	 * Trigers the create function of LoadBalancers
+	 * @param {LoadBalancerCreationOptions} options - Data required for create
+	 * @returns {Promise<createResponse>}
+	 */
+	create(options) {
+		return new Promise((resolve, reject) => {
+			this._loadBalancers
+				.create(options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getAll function of LoadBalancers
+	 * @returns {Promise<getAllResponse>}
+	 */
+	list() {
+		return new Promise((resolve, reject) => {
+			this._loadBalancers
+				.getAll()
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the update function of LoadBalancers
+	 * @param {StringKeyword} loadBalancerId - Data required for update
+	 * @param {AnyKeyword} options - Data required for update
+	 * @returns {Promise<updateResponse>}
+	 */
+	update(loadBalancerId, options) {
+		return new Promise((resolve, reject) => {
+			this._loadBalancers
+				.update(loadBalancerId, options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the delete function of LoadBalancers
+	 * @param {StringKeyword} loadBalancerId - Data required for delete
+	 * @returns {Promise<deleteResponse>}
+	 */
+	delete(loadBalancerId) {
+		return new Promise((resolve, reject) => {
+			this._loadBalancers
+				.delete(loadBalancerId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_LoadBalancer;
diff --git a/generator/generatedClasses/DO/storage/do-archivalStorage.js b/generator/generatedClasses/DO/storage/do-archivalStorage.js
new file mode 100644
index 00000000..9ce3d3ff
--- /dev/null
+++ b/generator/generatedClasses/DO/storage/do-archivalStorage.js
@@ -0,0 +1,72 @@
+/*This is an auto generated class, please do not change.*/
+/**
+ * Class to create a ObjectStorageClient object
+ * @category Oracle Cloud
+ */
+class Oracle_ArchivalStorage {
+	/**
+	 *
+	 * @param {module} do Oracle SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(ocisdk, params, clientConfiguration) {
+		this._oci = ocisdk;
+		this._sdkclassName = this._oci.objectStorageClient(
+			params,
+			clientConfiguration
+		);
+	}
+	/**
+	 * Trigers the createBucket function of ObjectStorageClient
+	 * @param {CreateBucketRequest} createBucketRequest - Data required for createBucket
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(createBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.createBucket(createBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteBucket function of ObjectStorageClient
+	 * @param {DeleteBucketRequest} deleteBucketRequest - Data required for deleteBucket
+	 * @returns {Promise<deleteBucketResponse>}
+	 */
+	delete(deleteBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.deleteBucket(deleteBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the listBuckets function of ObjectStorageClient
+	 * @param {ListBucketsRequest} listBucketsRequest - Data required for listBuckets
+	 * @returns {Promise<listBucketsResponse>}
+	 */
+	list(listBucketsRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.listBuckets(listBucketsRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the updateBucket function of ObjectStorageClient
+	 * @param {UpdateBucketRequest} updateBucketRequest - Data required for updateBucket
+	 * @returns {Promise<updateBucketResponse>}
+	 */
+	update(updateBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.updateBucket(updateBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+}
+module.exports = Oracle_ArchivalStorage;
diff --git a/generator/generatedClasses/DO/storage/do-blockStorage.js b/generator/generatedClasses/DO/storage/do-blockStorage.js
index 2a2c86f5..ce6bc60e 100644
--- a/generator/generatedClasses/DO/storage/do-blockStorage.js
+++ b/generator/generatedClasses/DO/storage/do-blockStorage.js
@@ -4,67 +4,67 @@
  * @category Digital Ocean
  */
 class DO_BlockStorage {
-  /**
-   *
-   * @param {module} do DO SDK
-   * @param {object} options SDK options
-   */
-  constructor(dosdk, dotoken) {
-    this._DO = dosdk;
-    this._instance = new this._DO(dotoken);
-    this._volumes = this._instance.volumes;
-  }
-  /**
-   * Trigers the getAll function of Volumes
-   * @param {StringKeyword} region - Data required for getAll
-   * @returns {Promise<getAllResponse>}
-   */
-  list(region) {
-    return new Promise((resolve, reject) => {
-      this._volumes
-        .getAll(region)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the create function of Volumes
-   * @param {VolumeCreationOptions} options - Data required for create
-   * @returns {Promise<createResponse>}
-   */
-  create(options) {
-    return new Promise((resolve, reject) => {
-      this._volumes
-        .create(options)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the getById function of Volumes
-   * @param {StringKeyword} volumeId - Data required for getById
-   * @returns {Promise<getByIdResponse>}
-   */
-  describe(volumeId) {
-    return new Promise((resolve, reject) => {
-      this._volumes
-        .getById(volumeId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
-  /**
-   * Trigers the deleteById function of Volumes
-   * @param {StringKeyword} volumeId - Data required for deleteById
-   * @returns {Promise<deleteByIdResponse>}
-   */
-  delete(volumeId) {
-    return new Promise((resolve, reject) => {
-      this._volumes
-        .deleteById(volumeId)
-        .then(data => resolve(data))
-        .catch(err => reject(err));
-    });
-  }
+	/**
+	 *
+	 * @param {module} do DO SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(dosdk, dotoken) {
+		this._DO = dosdk;
+		this._instance = new this._DO(dotoken);
+		this._volumes = this._instance.volumes;
+	}
+	/**
+	 * Trigers the getAll function of Volumes
+	 * @param {StringKeyword} region - Data required for getAll
+	 * @returns {Promise<getAllResponse>}
+	 */
+	list(region) {
+		return new Promise((resolve, reject) => {
+			this._volumes
+				.getAll(region)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the create function of Volumes
+	 * @param {VolumeCreationOptions} options - Data required for create
+	 * @returns {Promise<createResponse>}
+	 */
+	create(options) {
+		return new Promise((resolve, reject) => {
+			this._volumes
+				.create(options)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getById function of Volumes
+	 * @param {StringKeyword} volumeId - Data required for getById
+	 * @returns {Promise<getByIdResponse>}
+	 */
+	describe(volumeId) {
+		return new Promise((resolve, reject) => {
+			this._volumes
+				.getById(volumeId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteById function of Volumes
+	 * @param {StringKeyword} volumeId - Data required for deleteById
+	 * @returns {Promise<deleteByIdResponse>}
+	 */
+	delete(volumeId) {
+		return new Promise((resolve, reject) => {
+			this._volumes
+				.deleteById(volumeId)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
 }
 module.exports = DO_BlockStorage;
diff --git a/generator/generatedClasses/Oracle/storage/oci-archivalStorage.js b/generator/generatedClasses/Oracle/storage/oci-archivalStorage.js
new file mode 100644
index 00000000..9ce3d3ff
--- /dev/null
+++ b/generator/generatedClasses/Oracle/storage/oci-archivalStorage.js
@@ -0,0 +1,72 @@
+/*This is an auto generated class, please do not change.*/
+/**
+ * Class to create a ObjectStorageClient object
+ * @category Oracle Cloud
+ */
+class Oracle_ArchivalStorage {
+	/**
+	 *
+	 * @param {module} do Oracle SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(ocisdk, params, clientConfiguration) {
+		this._oci = ocisdk;
+		this._sdkclassName = this._oci.objectStorageClient(
+			params,
+			clientConfiguration
+		);
+	}
+	/**
+	 * Trigers the createBucket function of ObjectStorageClient
+	 * @param {CreateBucketRequest} createBucketRequest - Data required for createBucket
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(createBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.createBucket(createBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteBucket function of ObjectStorageClient
+	 * @param {DeleteBucketRequest} deleteBucketRequest - Data required for deleteBucket
+	 * @returns {Promise<deleteBucketResponse>}
+	 */
+	delete(deleteBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.deleteBucket(deleteBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the listBuckets function of ObjectStorageClient
+	 * @param {ListBucketsRequest} listBucketsRequest - Data required for listBuckets
+	 * @returns {Promise<listBucketsResponse>}
+	 */
+	list(listBucketsRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.listBuckets(listBucketsRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the updateBucket function of ObjectStorageClient
+	 * @param {UpdateBucketRequest} updateBucketRequest - Data required for updateBucket
+	 * @returns {Promise<updateBucketResponse>}
+	 */
+	update(updateBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.updateBucket(updateBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+}
+module.exports = Oracle_ArchivalStorage;
diff --git a/generator/generatedClasses/Oracle/storage/oci-storageBucket.js b/generator/generatedClasses/Oracle/storage/oci-storageBucket.js
new file mode 100644
index 00000000..61881ccc
--- /dev/null
+++ b/generator/generatedClasses/Oracle/storage/oci-storageBucket.js
@@ -0,0 +1,85 @@
+/*This is an auto generated class, please do not change.*/
+/**
+ * Class to create a ObjectStorageClient object
+ * @category Oracle Cloud
+ */
+class Oracle_StorageBucket {
+	/**
+	 *
+	 * @param {module} do Oracle SDK
+	 * @param {object} options SDK options
+	 */
+	constructor(ocisdk, params, clientConfiguration) {
+		this._oci = ocisdk;
+		this._sdkclassName = this._oci.objectStorageClient(
+			params,
+			clientConfiguration
+		);
+	}
+	/**
+	 * Trigers the createBucket function of ObjectStorageClient
+	 * @param {CreateBucketRequest} createBucketRequest - Data required for createBucket
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(createBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.createBucket(createBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the deleteBucket function of ObjectStorageClient
+	 * @param {DeleteBucketRequest} deleteBucketRequest - Data required for deleteBucket
+	 * @returns {Promise<deleteBucketResponse>}
+	 */
+	delete(deleteBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.deleteBucket(deleteBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the getBucket function of ObjectStorageClient
+	 * @param {GetBucketRequest} getBucketRequest - Data required for getBucket
+	 * @returns {Promise<getBucketResponse>}
+	 */
+	get(getBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.getBucket(getBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the listBuckets function of ObjectStorageClient
+	 * @param {ListBucketsRequest} listBucketsRequest - Data required for listBuckets
+	 * @returns {Promise<listBucketsResponse>}
+	 */
+	list(listBucketsRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.listBuckets(listBucketsRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+	/**
+	 * Trigers the reencryptBucket function of ObjectStorageClient
+	 * @param {ReencryptBucketRequest} reencryptBucketRequest - Data required for reencryptBucket
+	 * @returns {Promise<reencryptBucketResponse>}
+	 */
+	reencrypt(reencryptBucketRequest) {
+		return new Promise((resolve, reject) => {
+			this._objectStorageClient
+				.reencryptBucket(reencryptBucketRequest)
+				.then(data => resolve(data))
+				.catch(err => reject(err));
+		});
+	}
+}
+module.exports = Oracle_StorageBucket;
diff --git a/generator/generatedClasses/googleCloud/artificialinteligence/gcp-translation.js b/generator/generatedClasses/googleCloud/artificialinteligence/gcp-translation.js
index bcc03216..5ff02a87 100644
--- a/generator/generatedClasses/googleCloud/artificialinteligence/gcp-translation.js
+++ b/generator/generatedClasses/googleCloud/artificialinteligence/gcp-translation.js
@@ -1,106 +1,106 @@
-const { TranslationServiceClient } = require("@google-cloud/translate");
+const { TranslationServiceClient } = require('@google-cloud/translate');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Translation object
  * @category Google Cloud
  */
 class GCP_Translation {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._translationServiceClient = new TranslationServiceClient(config);
-  }
-  /**
-   * Trigers the translateText function of undefined
-   * @param {TypeReference} request - Data required for translateText
-   * @param {TypeReference} [options] - Data required for translateText
-   * @returns {Promise<translateTextResponse>}
-   */
-  translate(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._translationServiceClient
-        .translateText(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the batchTranslateText function of undefined
-   * @param {TypeReference} request - Data required for batchTranslateText
-   * @param {TypeReference} [options] - Data required for batchTranslateText
-   * @returns {Promise<batchTranslateTextResponse>}
-   */
-  batchTranslate(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._translationServiceClient
-        .batchTranslateText(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getGlossary function of undefined
-   * @param {TypeReference} request - Data required for getGlossary
-   * @param {TypeReference} [options] - Data required for getGlossary
-   * @returns {Promise<getGlossaryResponse>}
-   */
-  getGlossary(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._translationServiceClient
-        .getGlossary(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createGlossary function of undefined
-   * @param {TypeReference} request - Data required for createGlossary
-   * @param {TypeReference} [options] - Data required for createGlossary
-   * @returns {Promise<createGlossaryResponse>}
-   */
-  createGlossary(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._translationServiceClient
-        .createGlossary(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the detectLanguage function of undefined
-   * @param {TypeReference} request - Data required for detectLanguage
-   * @param {TypeReference} [options] - Data required for detectLanguage
-   * @returns {Promise<detectLanguageResponse>}
-   */
-  detectLanguage(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._translationServiceClient
-        .detectLanguage(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._translationServiceClient = new TranslationServiceClient(config);
+	}
+	/**
+	 * Trigers the translateText function of undefined
+	 * @param {TypeReference} request - Data required for translateText
+	 * @param {TypeReference} [options] - Data required for translateText
+	 * @returns {Promise<translateTextResponse>}
+	 */
+	translate(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._translationServiceClient
+				.translateText(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the batchTranslateText function of undefined
+	 * @param {TypeReference} request - Data required for batchTranslateText
+	 * @param {TypeReference} [options] - Data required for batchTranslateText
+	 * @returns {Promise<batchTranslateTextResponse>}
+	 */
+	batchTranslate(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._translationServiceClient
+				.batchTranslateText(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getGlossary function of undefined
+	 * @param {TypeReference} request - Data required for getGlossary
+	 * @param {TypeReference} [options] - Data required for getGlossary
+	 * @returns {Promise<getGlossaryResponse>}
+	 */
+	getGlossary(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._translationServiceClient
+				.getGlossary(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createGlossary function of undefined
+	 * @param {TypeReference} request - Data required for createGlossary
+	 * @param {TypeReference} [options] - Data required for createGlossary
+	 * @returns {Promise<createGlossaryResponse>}
+	 */
+	createGlossary(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._translationServiceClient
+				.createGlossary(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the detectLanguage function of undefined
+	 * @param {TypeReference} request - Data required for detectLanguage
+	 * @param {TypeReference} [options] - Data required for detectLanguage
+	 * @returns {Promise<detectLanguageResponse>}
+	 */
+	detectLanguage(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._translationServiceClient
+				.detectLanguage(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_Translation;
diff --git a/generator/generatedClasses/googleCloud/compute/gcp-kubernetes.js b/generator/generatedClasses/googleCloud/compute/gcp-kubernetes.js
index e0c08e67..8b2d00e5 100644
--- a/generator/generatedClasses/googleCloud/compute/gcp-kubernetes.js
+++ b/generator/generatedClasses/googleCloud/compute/gcp-kubernetes.js
@@ -1,178 +1,178 @@
-const { ClusterManagerClient } = require("@google-cloud/container");
+const { ClusterManagerClient } = require('@google-cloud/container');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Kubernetes object
  * @category Google Cloud
  */
 class GCP_Kubernetes {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._clusterManagerClient = new ClusterManagerClient(config);
-  }
-  /**
-   * Trigers the createCluster function of undefined
-   * @param {TypeReference} request - Data required for createCluster
-   * @param {TypeReference} [options] - Data required for createCluster
-   * @returns {Promise<createClusterResponse>}
-   */
-  create(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .createCluster(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteCluster function of undefined
-   * @param {TypeReference} request - Data required for deleteCluster
-   * @param {TypeReference} [options] - Data required for deleteCluster
-   * @returns {Promise<deleteClusterResponse>}
-   */
-  delete(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .deleteCluster(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listClusters function of undefined
-   * @param {TypeReference} request - Data required for listClusters
-   * @param {TypeReference} [options] - Data required for listClusters
-   * @returns {Promise<listClustersResponse>}
-   */
-  listClusters(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .listClusters(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getCluster function of undefined
-   * @param {TypeReference} request - Data required for getCluster
-   * @param {TypeReference} [options] - Data required for getCluster
-   * @returns {Promise<getClusterResponse>}
-   */
-  describeCluster(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .getCluster(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createNodePool function of undefined
-   * @param {TypeReference} request - Data required for createNodePool
-   * @param {TypeReference} [options] - Data required for createNodePool
-   * @returns {Promise<createNodePoolResponse>}
-   */
-  createNodeGroup(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .createNodePool(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteNodePool function of undefined
-   * @param {TypeReference} request - Data required for deleteNodePool
-   * @param {TypeReference} [options] - Data required for deleteNodePool
-   * @returns {Promise<deleteNodePoolResponse>}
-   */
-  deleteNodegroup(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .deleteNodePool(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getNodePool function of undefined
-   * @param {TypeReference} request - Data required for getNodePool
-   * @param {TypeReference} [options] - Data required for getNodePool
-   * @returns {Promise<getNodePoolResponse>}
-   */
-  describeNodeGroup(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .getNodePool(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listNodePools function of undefined
-   * @param {TypeReference} request - Data required for listNodePools
-   * @param {TypeReference} [options] - Data required for listNodePools
-   * @returns {Promise<listNodePoolsResponse>}
-   */
-  listNodegroups(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .listNodePools(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the setAddonsConfig function of undefined
-   * @param {TypeReference} request - Data required for setAddonsConfig
-   * @param {TypeReference} [options] - Data required for setAddonsConfig
-   * @returns {Promise<setAddonsConfigResponse>}
-   */
-  updateConfig(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._clusterManagerClient
-        .setAddonsConfig(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._clusterManagerClient = new ClusterManagerClient(config);
+	}
+	/**
+	 * Trigers the createCluster function of undefined
+	 * @param {TypeReference} request - Data required for createCluster
+	 * @param {TypeReference} [options] - Data required for createCluster
+	 * @returns {Promise<createClusterResponse>}
+	 */
+	create(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.createCluster(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteCluster function of undefined
+	 * @param {TypeReference} request - Data required for deleteCluster
+	 * @param {TypeReference} [options] - Data required for deleteCluster
+	 * @returns {Promise<deleteClusterResponse>}
+	 */
+	delete(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.deleteCluster(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listClusters function of undefined
+	 * @param {TypeReference} request - Data required for listClusters
+	 * @param {TypeReference} [options] - Data required for listClusters
+	 * @returns {Promise<listClustersResponse>}
+	 */
+	listClusters(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.listClusters(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getCluster function of undefined
+	 * @param {TypeReference} request - Data required for getCluster
+	 * @param {TypeReference} [options] - Data required for getCluster
+	 * @returns {Promise<getClusterResponse>}
+	 */
+	describeCluster(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.getCluster(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createNodePool function of undefined
+	 * @param {TypeReference} request - Data required for createNodePool
+	 * @param {TypeReference} [options] - Data required for createNodePool
+	 * @returns {Promise<createNodePoolResponse>}
+	 */
+	createNodeGroup(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.createNodePool(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteNodePool function of undefined
+	 * @param {TypeReference} request - Data required for deleteNodePool
+	 * @param {TypeReference} [options] - Data required for deleteNodePool
+	 * @returns {Promise<deleteNodePoolResponse>}
+	 */
+	deleteNodegroup(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.deleteNodePool(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getNodePool function of undefined
+	 * @param {TypeReference} request - Data required for getNodePool
+	 * @param {TypeReference} [options] - Data required for getNodePool
+	 * @returns {Promise<getNodePoolResponse>}
+	 */
+	describeNodeGroup(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.getNodePool(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listNodePools function of undefined
+	 * @param {TypeReference} request - Data required for listNodePools
+	 * @param {TypeReference} [options] - Data required for listNodePools
+	 * @returns {Promise<listNodePoolsResponse>}
+	 */
+	listNodegroups(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.listNodePools(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the setAddonsConfig function of undefined
+	 * @param {TypeReference} request - Data required for setAddonsConfig
+	 * @param {TypeReference} [options] - Data required for setAddonsConfig
+	 * @returns {Promise<setAddonsConfigResponse>}
+	 */
+	updateConfig(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._clusterManagerClient
+				.setAddonsConfig(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_Kubernetes;
diff --git a/generator/generatedClasses/googleCloud/database/gcp-RDBMS.js b/generator/generatedClasses/googleCloud/database/gcp-RDBMS.js
index 46bbe942..e783c97f 100644
--- a/generator/generatedClasses/googleCloud/database/gcp-RDBMS.js
+++ b/generator/generatedClasses/googleCloud/database/gcp-RDBMS.js
@@ -1,134 +1,138 @@
-const { DatabaseAdminClient } = require("@google-cloud/spanner");
+const { DatabaseAdminClient } = require('@google-cloud/spanner');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a RDBMS object
  * @category Google Cloud
  */
 class GCP_RDBMS {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._databaseAdminClient = new DatabaseAdminClient(config);
-  }
-  /**
-   * Trigers the createDatabase function of undefined
-   * @param {TypeReference} request - Data required for createDatabase
-   * @param {TypeReference} [options] - Data required for createDatabase
-   * @returns {Promise<createDatabaseResponse>}
-   */
-  createDatabse(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .createDatabase(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the dropDatabase function of undefined
-   * @param {TypeReference} request - Data required for dropDatabase
-   * @param {TypeReference} [options] - Data required for dropDatabase
-   * @returns {Promise<dropDatabaseResponse>}
-   */
-  deleteDatabase(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .dropDatabase(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createBackup function of undefined
-   * @param {TypeReference} request - Data required for createBackup
-   * @param {TypeReference} [options] - Data required for createBackup
-   * @returns {Promise<createBackupResponse>}
-   */
-  createSnapshots(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .createBackup(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateDatabaseDdl function of undefined
-   * @param {TypeReference} request - Data required for updateDatabaseDdl
-   * @param {TypeReference} [options] - Data required for updateDatabaseDdl
-   * @returns {Promise<updateDatabaseDdlResponse>}
-   */
-  modifyDB(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .updateDatabaseDdl(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the restoreDatabase function of undefined
-   * @param {TypeReference} request - Data required for restoreDatabase
-   * @param {TypeReference} [options] - Data required for restoreDatabase
-   * @returns {Promise<restoreDatabaseResponse>}
-   */
-  restoreDatabase(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .restoreDatabase(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteBackup function of undefined
-   * @param {TypeReference} request - Data required for deleteBackup
-   * @param {TypeReference} [options] - Data required for deleteBackup
-   * @returns {Promise<deleteBackupResponse>}
-   */
-  deleteDBSnapshot(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._databaseAdminClient
-        .deleteBackup(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the databasePath function of undefined
-   * @param {StringKeyword} project - Data required for databasePath
-   * @param {StringKeyword} instance - Data required for databasePath
-   * @param {StringKeyword} database - Data required for databasePath
-   * @returns {Promise<databasePathResponse>}
-   */
-  databasePath(project, instance, database) {
-    return this._databaseAdminClient.databasePath(project, instance, database);
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._databaseAdminClient = new DatabaseAdminClient(config);
+	}
+	/**
+	 * Trigers the createDatabase function of undefined
+	 * @param {TypeReference} request - Data required for createDatabase
+	 * @param {TypeReference} [options] - Data required for createDatabase
+	 * @returns {Promise<createDatabaseResponse>}
+	 */
+	createDatabse(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.createDatabase(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the dropDatabase function of undefined
+	 * @param {TypeReference} request - Data required for dropDatabase
+	 * @param {TypeReference} [options] - Data required for dropDatabase
+	 * @returns {Promise<dropDatabaseResponse>}
+	 */
+	deleteDatabase(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.dropDatabase(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createBackup function of undefined
+	 * @param {TypeReference} request - Data required for createBackup
+	 * @param {TypeReference} [options] - Data required for createBackup
+	 * @returns {Promise<createBackupResponse>}
+	 */
+	createSnapshots(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.createBackup(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateDatabaseDdl function of undefined
+	 * @param {TypeReference} request - Data required for updateDatabaseDdl
+	 * @param {TypeReference} [options] - Data required for updateDatabaseDdl
+	 * @returns {Promise<updateDatabaseDdlResponse>}
+	 */
+	modifyDB(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.updateDatabaseDdl(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the restoreDatabase function of undefined
+	 * @param {TypeReference} request - Data required for restoreDatabase
+	 * @param {TypeReference} [options] - Data required for restoreDatabase
+	 * @returns {Promise<restoreDatabaseResponse>}
+	 */
+	restoreDatabase(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.restoreDatabase(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteBackup function of undefined
+	 * @param {TypeReference} request - Data required for deleteBackup
+	 * @param {TypeReference} [options] - Data required for deleteBackup
+	 * @returns {Promise<deleteBackupResponse>}
+	 */
+	deleteDBSnapshot(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._databaseAdminClient
+				.deleteBackup(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the databasePath function of undefined
+	 * @param {StringKeyword} project - Data required for databasePath
+	 * @param {StringKeyword} instance - Data required for databasePath
+	 * @param {StringKeyword} database - Data required for databasePath
+	 * @returns {Promise<databasePathResponse>}
+	 */
+	databasePath(project, instance, database) {
+		return this._databaseAdminClient.databasePath(
+			project,
+			instance,
+			database
+		);
+	}
 }
 module.exports = GCP_RDBMS;
diff --git a/generator/generatedClasses/googleCloud/database/gcp-noSql.js b/generator/generatedClasses/googleCloud/database/gcp-noSql.js
index 7857a959..626a8256 100644
--- a/generator/generatedClasses/googleCloud/database/gcp-noSql.js
+++ b/generator/generatedClasses/googleCloud/database/gcp-noSql.js
@@ -1,79 +1,79 @@
-const { FirestoreClient } = require("@google-cloud/firestore");
+const { FirestoreClient } = require('@google-cloud/firestore');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a NoSql object
  * @category Google Cloud
  */
 class GCP_NoSql {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._firestoreClient = new FirestoreClient(config);
-  }
-  /**
-   * Trigers the createDocument function of undefined
-   * @param {TypeReference} request - Data required for createDocument
-   * @param {TypeReference} [options] - Data required for createDocument
-   * @returns {Promise<createDocumentResponse>}
-   */
-  createItem(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._firestoreClient
-        .createDocument(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteDocument function of undefined
-   * @param {TypeReference} request - Data required for deleteDocument
-   * @param {TypeReference} [options] - Data required for deleteDocument
-   * @returns {Promise<deleteDocumentResponse>}
-   */
-  deleteItem(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._firestoreClient
-        .deleteDocument(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateDocument function of undefined
-   * @param {TypeReference} request - Data required for updateDocument
-   * @param {TypeReference} [options] - Data required for updateDocument
-   * @returns {Promise<updateDocumentResponse>}
-   */
-  updateItem(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._firestoreClient
-        .updateDocument(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the runQuery function of undefined
-   * @param {TypeReference} [request] - Data required for runQuery
-   * @param {TypeReference} [options] - Data required for runQuery
-   * @returns {Promise<runQueryResponse>}
-   */
-  query(request = undefined, options = undefined) {
-    return this._firestoreClient.runQuery(request, options);
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._firestoreClient = new FirestoreClient(config);
+	}
+	/**
+	 * Trigers the createDocument function of undefined
+	 * @param {TypeReference} request - Data required for createDocument
+	 * @param {TypeReference} [options] - Data required for createDocument
+	 * @returns {Promise<createDocumentResponse>}
+	 */
+	createItem(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._firestoreClient
+				.createDocument(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteDocument function of undefined
+	 * @param {TypeReference} request - Data required for deleteDocument
+	 * @param {TypeReference} [options] - Data required for deleteDocument
+	 * @returns {Promise<deleteDocumentResponse>}
+	 */
+	deleteItem(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._firestoreClient
+				.deleteDocument(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateDocument function of undefined
+	 * @param {TypeReference} request - Data required for updateDocument
+	 * @param {TypeReference} [options] - Data required for updateDocument
+	 * @returns {Promise<updateDocumentResponse>}
+	 */
+	updateItem(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._firestoreClient
+				.updateDocument(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the runQuery function of undefined
+	 * @param {TypeReference} [request] - Data required for runQuery
+	 * @param {TypeReference} [options] - Data required for runQuery
+	 * @returns {Promise<runQueryResponse>}
+	 */
+	query(request = undefined, options = undefined) {
+		return this._firestoreClient.runQuery(request, options);
+	}
 }
 module.exports = GCP_NoSql;
diff --git a/generator/generatedClasses/googleCloud/management/gcp-keyManagement.js b/generator/generatedClasses/googleCloud/management/gcp-keyManagement.js
index 8a106f5d..e90fee97 100644
--- a/generator/generatedClasses/googleCloud/management/gcp-keyManagement.js
+++ b/generator/generatedClasses/googleCloud/management/gcp-keyManagement.js
@@ -1,107 +1,109 @@
-const { KeyManagementServiceClient } = require("@google-cloud/kms");
+const { KeyManagementServiceClient } = require('@google-cloud/kms');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a KeyManagement object
  * @category Google Cloud
  */
 class GCP_KeyManagement {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._keyManagementServiceClient = new KeyManagementServiceClient(config);
-  }
-  /**
-   * Trigers the createCryptoKey function of undefined
-   * @param {TypeReference} request - Data required for createCryptoKey
-   * @param {TypeReference} [options] - Data required for createCryptoKey
-   * @returns {Promise<createCryptoKeyResponse>}
-   */
-  createKey(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._keyManagementServiceClient
-        .createCryptoKey(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the destroyCryptoKeyVersion function of undefined
-   * @param {TypeReference} request - Data required for destroyCryptoKeyVersion
-   * @param {TypeReference} [options] - Data required for destroyCryptoKeyVersion
-   * @returns {Promise<destroyCryptoKeyVersionResponse>}
-   */
-  deleteKey(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._keyManagementServiceClient
-        .destroyCryptoKeyVersion(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateCryptoKey function of undefined
-   * @param {TypeReference} request - Data required for updateCryptoKey
-   * @param {TypeReference} [options] - Data required for updateCryptoKey
-   * @returns {Promise<updateCryptoKeyResponse>}
-   */
-  update(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._keyManagementServiceClient
-        .updateCryptoKey(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getCryptoKey function of undefined
-   * @param {TypeReference} request - Data required for getCryptoKey
-   * @param {TypeReference} [options] - Data required for getCryptoKey
-   * @returns {Promise<getCryptoKeyResponse>}
-   */
-  describeKey(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._keyManagementServiceClient
-        .getCryptoKey(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the setIamPolicy function of undefined
-   * @param {TypeReference} request - Data required for setIamPolicy
-   * @param {UnionType} [options] - Data required for setIamPolicy
-   * @param {TypeReference} [callback] - Data required for setIamPolicy
-   * @returns {Promise<setIamPolicyResponse>}
-   */
-  putKeyPolicy(request, options = undefined, callback = undefined) {
-    return new Promise((resolve, reject) => {
-      this._keyManagementServiceClient
-        .setIamPolicy(request, options, callback)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._keyManagementServiceClient = new KeyManagementServiceClient(
+			config
+		);
+	}
+	/**
+	 * Trigers the createCryptoKey function of undefined
+	 * @param {TypeReference} request - Data required for createCryptoKey
+	 * @param {TypeReference} [options] - Data required for createCryptoKey
+	 * @returns {Promise<createCryptoKeyResponse>}
+	 */
+	createKey(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._keyManagementServiceClient
+				.createCryptoKey(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the destroyCryptoKeyVersion function of undefined
+	 * @param {TypeReference} request - Data required for destroyCryptoKeyVersion
+	 * @param {TypeReference} [options] - Data required for destroyCryptoKeyVersion
+	 * @returns {Promise<destroyCryptoKeyVersionResponse>}
+	 */
+	deleteKey(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._keyManagementServiceClient
+				.destroyCryptoKeyVersion(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateCryptoKey function of undefined
+	 * @param {TypeReference} request - Data required for updateCryptoKey
+	 * @param {TypeReference} [options] - Data required for updateCryptoKey
+	 * @returns {Promise<updateCryptoKeyResponse>}
+	 */
+	update(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._keyManagementServiceClient
+				.updateCryptoKey(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getCryptoKey function of undefined
+	 * @param {TypeReference} request - Data required for getCryptoKey
+	 * @param {TypeReference} [options] - Data required for getCryptoKey
+	 * @returns {Promise<getCryptoKeyResponse>}
+	 */
+	describeKey(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._keyManagementServiceClient
+				.getCryptoKey(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the setIamPolicy function of undefined
+	 * @param {TypeReference} request - Data required for setIamPolicy
+	 * @param {UnionType} [options] - Data required for setIamPolicy
+	 * @param {TypeReference} [callback] - Data required for setIamPolicy
+	 * @returns {Promise<setIamPolicyResponse>}
+	 */
+	putKeyPolicy(request, options = undefined, callback = undefined) {
+		return new Promise((resolve, reject) => {
+			this._keyManagementServiceClient
+				.setIamPolicy(request, options, callback)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_KeyManagement;
diff --git a/generator/generatedClasses/googleCloud/management/gcp-monitoring.js b/generator/generatedClasses/googleCloud/management/gcp-monitoring.js
index 8ea14029..4c03f5d1 100644
--- a/generator/generatedClasses/googleCloud/management/gcp-monitoring.js
+++ b/generator/generatedClasses/googleCloud/management/gcp-monitoring.js
@@ -1,116 +1,116 @@
-const { AlertPolicyServiceClient } = require("@google-cloud/monitoring");
-const { MetricServiceClient } = require("@google-cloud/monitoring");
+const { AlertPolicyServiceClient } = require('@google-cloud/monitoring');
+const { MetricServiceClient } = require('@google-cloud/monitoring');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a Monitoring object
  * @category Google Cloud
  */
 class GCP_Monitoring {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._alertPolicyServiceClient = new AlertPolicyServiceClient(config);
-    this._metricServiceClient = new MetricServiceClient(config);
-  }
-  /**
-   * Trigers the createAlertPolicy function of undefined
-   * @param {TypeReference} request - Data required for createAlertPolicy
-   * @param {TypeReference} [options] - Data required for createAlertPolicy
-   * @returns {Promise<createAlertPolicyResponse>}
-   */
-  createAlarm(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._alertPolicyServiceClient
-        .createAlertPolicy(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteAlertPolicy function of undefined
-   * @param {TypeReference} request - Data required for deleteAlertPolicy
-   * @param {TypeReference} [options] - Data required for deleteAlertPolicy
-   * @returns {Promise<deleteAlertPolicyResponse>}
-   */
-  deleteAlarm(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._alertPolicyServiceClient
-        .deleteAlertPolicy(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the updateAlertPolicy function of undefined
-   * @param {TypeReference} request - Data required for updateAlertPolicy
-   * @param {TypeReference} [options] - Data required for updateAlertPolicy
-   * @returns {Promise<updateAlertPolicyResponse>}
-   */
-  updateAlarm(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._alertPolicyServiceClient
-        .updateAlertPolicy(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listAlertPolicies function of undefined
-   * @param {TypeReference} request - Data required for listAlertPolicies
-   * @param {TypeReference} [options] - Data required for listAlertPolicies
-   * @returns {Promise<listAlertPoliciesResponse>}
-   */
-  listAlarms(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._alertPolicyServiceClient
-        .listAlertPolicies(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getMetricDescriptor function of undefined
-   * @param {TypeReference} request - Data required for getMetricDescriptor
-   * @param {TypeReference} [options] - Data required for getMetricDescriptor
-   * @returns {Promise<getMetricDescriptorResponse>}
-   */
-  getMetricData(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._metricServiceClient
-        .getMetricDescriptor(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the projectPath function of undefined
-   * @param {StringKeyword} project - Data required for projectPath
-   * @returns {Promise<projectPathResponse>}
-   */
-  projectPath(project) {
-    return this._alertPolicyServiceClient.projectPath(project);
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._alertPolicyServiceClient = new AlertPolicyServiceClient(config);
+		this._metricServiceClient = new MetricServiceClient(config);
+	}
+	/**
+	 * Trigers the createAlertPolicy function of undefined
+	 * @param {TypeReference} request - Data required for createAlertPolicy
+	 * @param {TypeReference} [options] - Data required for createAlertPolicy
+	 * @returns {Promise<createAlertPolicyResponse>}
+	 */
+	createAlarm(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._alertPolicyServiceClient
+				.createAlertPolicy(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteAlertPolicy function of undefined
+	 * @param {TypeReference} request - Data required for deleteAlertPolicy
+	 * @param {TypeReference} [options] - Data required for deleteAlertPolicy
+	 * @returns {Promise<deleteAlertPolicyResponse>}
+	 */
+	deleteAlarm(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._alertPolicyServiceClient
+				.deleteAlertPolicy(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the updateAlertPolicy function of undefined
+	 * @param {TypeReference} request - Data required for updateAlertPolicy
+	 * @param {TypeReference} [options] - Data required for updateAlertPolicy
+	 * @returns {Promise<updateAlertPolicyResponse>}
+	 */
+	updateAlarm(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._alertPolicyServiceClient
+				.updateAlertPolicy(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listAlertPolicies function of undefined
+	 * @param {TypeReference} request - Data required for listAlertPolicies
+	 * @param {TypeReference} [options] - Data required for listAlertPolicies
+	 * @returns {Promise<listAlertPoliciesResponse>}
+	 */
+	listAlarms(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._alertPolicyServiceClient
+				.listAlertPolicies(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getMetricDescriptor function of undefined
+	 * @param {TypeReference} request - Data required for getMetricDescriptor
+	 * @param {TypeReference} [options] - Data required for getMetricDescriptor
+	 * @returns {Promise<getMetricDescriptorResponse>}
+	 */
+	getMetricData(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._metricServiceClient
+				.getMetricDescriptor(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the projectPath function of undefined
+	 * @param {StringKeyword} project - Data required for projectPath
+	 * @returns {Promise<projectPathResponse>}
+	 */
+	projectPath(project) {
+		return this._alertPolicyServiceClient.projectPath(project);
+	}
 }
 module.exports = GCP_Monitoring;
diff --git a/generator/generatedClasses/googleCloud/management/gcp-notificationService.js b/generator/generatedClasses/googleCloud/management/gcp-notificationService.js
index ff4ee74f..447558f5 100644
--- a/generator/generatedClasses/googleCloud/management/gcp-notificationService.js
+++ b/generator/generatedClasses/googleCloud/management/gcp-notificationService.js
@@ -1,162 +1,162 @@
-const { PublisherClient } = require("@google-cloud/pubsub");
-const { SubscriberClient } = require("@google-cloud/pubsub");
+const { PublisherClient } = require('@google-cloud/pubsub');
+const { SubscriberClient } = require('@google-cloud/pubsub');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a NotificationService object
  * @category Google Cloud
  */
 class GCP_NotificationService {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._publisherClient = new PublisherClient(config);
-    this._subscriberClient = new SubscriberClient(config);
-  }
-  /**
-   * Trigers the createTopic function of undefined
-   * @param {TypeReference} request - Data required for createTopic
-   * @param {TypeReference} [options] - Data required for createTopic
-   * @returns {Promise<createTopicResponse>}
-   */
-  createTopic(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .createTopic(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteTopic function of undefined
-   * @param {TypeReference} request - Data required for deleteTopic
-   * @param {TypeReference} [options] - Data required for deleteTopic
-   * @returns {Promise<deleteTopicResponse>}
-   */
-  deleteTopic(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .deleteTopic(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getTopic function of undefined
-   * @param {TypeReference} request - Data required for getTopic
-   * @param {TypeReference} [options] - Data required for getTopic
-   * @returns {Promise<getTopicResponse>}
-   */
-  getTopicAttributes(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .getTopic(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listTopicSubscriptions function of undefined
-   * @param {TypeReference} request - Data required for listTopicSubscriptions
-   * @param {TypeReference} [options] - Data required for listTopicSubscriptions
-   * @returns {Promise<listTopicSubscriptionsResponse>}
-   */
-  listSubscriptions(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .listTopicSubscriptions(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createSubscription function of undefined
-   * @param {TypeReference} request - Data required for createSubscription
-   * @param {TypeReference} [options] - Data required for createSubscription
-   * @returns {Promise<createSubscriptionResponse>}
-   */
-  subscribe(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._subscriberClient
-        .createSubscription(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the publish function of undefined
-   * @param {TypeReference} request - Data required for publish
-   * @param {TypeReference} [options] - Data required for publish
-   * @returns {Promise<publishResponse>}
-   */
-  publish(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .publish(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the listTopics function of undefined
-   * @param {TypeReference} request - Data required for listTopics
-   * @param {TypeReference} [options] - Data required for listTopics
-   * @returns {Promise<listTopicsResponse>}
-   */
-  listTopics(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._publisherClient
-        .listTopics(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the deleteSubscription function of undefined
-   * @param {TypeReference} request - Data required for deleteSubscription
-   * @param {TypeReference} [options] - Data required for deleteSubscription
-   * @returns {Promise<deleteSubscriptionResponse>}
-   */
-  unsubscribe(request, options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._subscriberClient
-        .deleteSubscription(request, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._publisherClient = new PublisherClient(config);
+		this._subscriberClient = new SubscriberClient(config);
+	}
+	/**
+	 * Trigers the createTopic function of undefined
+	 * @param {TypeReference} request - Data required for createTopic
+	 * @param {TypeReference} [options] - Data required for createTopic
+	 * @returns {Promise<createTopicResponse>}
+	 */
+	createTopic(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.createTopic(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteTopic function of undefined
+	 * @param {TypeReference} request - Data required for deleteTopic
+	 * @param {TypeReference} [options] - Data required for deleteTopic
+	 * @returns {Promise<deleteTopicResponse>}
+	 */
+	deleteTopic(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.deleteTopic(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getTopic function of undefined
+	 * @param {TypeReference} request - Data required for getTopic
+	 * @param {TypeReference} [options] - Data required for getTopic
+	 * @returns {Promise<getTopicResponse>}
+	 */
+	getTopicAttributes(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.getTopic(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listTopicSubscriptions function of undefined
+	 * @param {TypeReference} request - Data required for listTopicSubscriptions
+	 * @param {TypeReference} [options] - Data required for listTopicSubscriptions
+	 * @returns {Promise<listTopicSubscriptionsResponse>}
+	 */
+	listSubscriptions(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.listTopicSubscriptions(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createSubscription function of undefined
+	 * @param {TypeReference} request - Data required for createSubscription
+	 * @param {TypeReference} [options] - Data required for createSubscription
+	 * @returns {Promise<createSubscriptionResponse>}
+	 */
+	subscribe(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._subscriberClient
+				.createSubscription(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the publish function of undefined
+	 * @param {TypeReference} request - Data required for publish
+	 * @param {TypeReference} [options] - Data required for publish
+	 * @returns {Promise<publishResponse>}
+	 */
+	publish(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.publish(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the listTopics function of undefined
+	 * @param {TypeReference} request - Data required for listTopics
+	 * @param {TypeReference} [options] - Data required for listTopics
+	 * @returns {Promise<listTopicsResponse>}
+	 */
+	listTopics(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._publisherClient
+				.listTopics(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the deleteSubscription function of undefined
+	 * @param {TypeReference} request - Data required for deleteSubscription
+	 * @param {TypeReference} [options] - Data required for deleteSubscription
+	 * @returns {Promise<deleteSubscriptionResponse>}
+	 */
+	unsubscribe(request, options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._subscriberClient
+				.deleteSubscription(request, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_NotificationService;
diff --git a/generator/generatedClasses/googleCloud/network/gcp-DNS.js b/generator/generatedClasses/googleCloud/network/gcp-DNS.js
index acb9acd3..eadb0c8a 100644
--- a/generator/generatedClasses/googleCloud/network/gcp-DNS.js
+++ b/generator/generatedClasses/googleCloud/network/gcp-DNS.js
@@ -1,104 +1,101 @@
-const { DNS } = require("@google-cloud/dns");
+const { DNS } = require('@google-cloud/dns');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a dns object
  * @category Google Cloud
  */
 class GCP_dns {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._dns = new DNS(config);
-  }
-  /**
-   * Trigers the getZones function of dns
-   * @param {TypeReference} [query] - Optional parameter
-   * @returns {Promise<getZonesResponse>}
-   */
-  listZones(query = undefined) {
-    return new Promise((resolve, reject) => {
-      this._dns
-        .getZones(query)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the create function of dns
-   * @param {string} [identifier] - Optional parameter
-   * @param {DNS} dns - Mandatory parameter
-   * @param {TypeReference} config - Mandatory parameter
-   * @returns {Promise<createResponse>}
-   */
-  createZone(dns, config, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      dns
-        .zone(identifier)
-        .create(config)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createChange function of dns
-   * @param {string} [identifier] - Optional parameter
-   * @param {DNS} dns - Mandatory parameter
-   * @param {TypeReference} config - Mandatory parameter
-   * @returns {Promise<createChangeResponse>}
-   */
-  changeRecordSets(dns, config, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      dns
-        .zone(identifier)
-        .createChange(config)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the delete function of dns
-   * @param {string} [identifier] - Optional parameter
-   * @param {DNS} dns - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<deleteResponse>}
-   */
-  deleteZone(dns, options = undefined, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      dns
-        .zone(identifier)
-        .delete(options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the record function of dns
-   * @param {string} [identifier] - Optional parameter
-   * @param {DNS} dns - Mandatory parameter
-   * @param {StringKeyword} type - Mandatory parameter
-   * @param {TypeReference} metadata - Mandatory parameter
-   * @returns {Promise<recordResponse>}
-   */
-  record(dns, type, metadata) {
-    return this.dns.record(type, metadata);
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._dns = new DNS(config);
+	}
+	/**
+	 * Trigers the getZones function of dns
+	 * @param {TypeReference} [query] - Optional parameter
+	 * @returns {Promise<getZonesResponse>}
+	 */
+	listZones(query = undefined) {
+		return new Promise((resolve, reject) => {
+			this._dns
+				.getZones(query)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the create function of dns
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {DNS} dns - Mandatory parameter
+	 * @param {TypeReference} config - Mandatory parameter
+	 * @returns {Promise<createResponse>}
+	 */
+	createZone(dns, config, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			dns.zone(identifier)
+				.create(config)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createChange function of dns
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {DNS} dns - Mandatory parameter
+	 * @param {TypeReference} config - Mandatory parameter
+	 * @returns {Promise<createChangeResponse>}
+	 */
+	changeRecordSets(dns, config, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			dns.zone(identifier)
+				.createChange(config)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the delete function of dns
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {DNS} dns - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<deleteResponse>}
+	 */
+	deleteZone(dns, options = undefined, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			dns.zone(identifier)
+				.delete(options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the record function of dns
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {DNS} dns - Mandatory parameter
+	 * @param {StringKeyword} type - Mandatory parameter
+	 * @param {TypeReference} metadata - Mandatory parameter
+	 * @returns {Promise<recordResponse>}
+	 */
+	record(dns, type, metadata) {
+		return this.dns.record(type, metadata);
+	}
 }
 module.exports = GCP_dns;
diff --git a/generator/generatedClasses/googleCloud/storage/gcp-archivalStorage.js b/generator/generatedClasses/googleCloud/storage/gcp-archivalStorage.js
index a51af327..75ab8af4 100644
--- a/generator/generatedClasses/googleCloud/storage/gcp-archivalStorage.js
+++ b/generator/generatedClasses/googleCloud/storage/gcp-archivalStorage.js
@@ -1,111 +1,111 @@
-const { Storage } = require("@google-cloud/storage");
+const { Storage } = require('@google-cloud/storage');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a storage object
  * @category Google Cloud
  */
 class GCP_storage {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._storage = new Storage(config);
-  }
-  /**
-   * Trigers the deleteFiles function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Storage} storage - Mandatory parameter
-   * @param {TypeReference} [query] - Optional parameter
-   * @returns {Promise<deleteFilesResponse>}
-   */
-  deleteFiles(storage, query = undefined, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      storage
-        .bucket(identifier)
-        .deleteFiles(query)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the upload function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Storage} storage - Mandatory parameter
-   * @param {StringKeyword} pathString - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<uploadResponse>}
-   */
-  upload(storage, pathString, options = undefined, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      storage
-        .bucket(identifier)
-        .upload(pathString, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the makePublic function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Bucket} bucket - Mandatory parameter
-   * @returns {Promise<makePublicResponse>}
-   */
-  makePublic(bucket, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      bucket
-        .file(identifier)
-        .makePublic()
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createBucket function of storage
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [metadata] - Optional parameter
-   * @returns {Promise<createBucketResponse>}
-   */
-  create(name, metadata = undefined) {
-    return new Promise((resolve, reject) => {
-      this._storage
-        .createBucket(name, metadata)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getBuckets function of storage
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getBucketsResponse>}
-   */
-  list(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._storage
-        .getBuckets(options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._storage = new Storage(config);
+	}
+	/**
+	 * Trigers the deleteFiles function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Storage} storage - Mandatory parameter
+	 * @param {TypeReference} [query] - Optional parameter
+	 * @returns {Promise<deleteFilesResponse>}
+	 */
+	deleteFiles(storage, query = undefined, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			storage
+				.bucket(identifier)
+				.deleteFiles(query)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the upload function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Storage} storage - Mandatory parameter
+	 * @param {StringKeyword} pathString - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<uploadResponse>}
+	 */
+	upload(storage, pathString, options = undefined, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			storage
+				.bucket(identifier)
+				.upload(pathString, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the makePublic function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Bucket} bucket - Mandatory parameter
+	 * @returns {Promise<makePublicResponse>}
+	 */
+	makePublic(bucket, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			bucket
+				.file(identifier)
+				.makePublic()
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createBucket function of storage
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [metadata] - Optional parameter
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(name, metadata = undefined) {
+		return new Promise((resolve, reject) => {
+			this._storage
+				.createBucket(name, metadata)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getBuckets function of storage
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getBucketsResponse>}
+	 */
+	list(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._storage
+				.getBuckets(options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_storage;
diff --git a/generator/generatedClasses/googleCloud/storage/gcp-storageBucket.js b/generator/generatedClasses/googleCloud/storage/gcp-storageBucket.js
index a51af327..75ab8af4 100644
--- a/generator/generatedClasses/googleCloud/storage/gcp-storageBucket.js
+++ b/generator/generatedClasses/googleCloud/storage/gcp-storageBucket.js
@@ -1,111 +1,111 @@
-const { Storage } = require("@google-cloud/storage");
+const { Storage } = require('@google-cloud/storage');
 /*This is an auto generated class, please do not change.*/
 /**
  * Class to create a storage object
  * @category Google Cloud
  */
 class GCP_storage {
-  /**
-   *
-   * @param {object} config Configuration object
-   */
-  constructor(config) {
-    this._storage = new Storage(config);
-  }
-  /**
-   * Trigers the deleteFiles function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Storage} storage - Mandatory parameter
-   * @param {TypeReference} [query] - Optional parameter
-   * @returns {Promise<deleteFilesResponse>}
-   */
-  deleteFiles(storage, query = undefined, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      storage
-        .bucket(identifier)
-        .deleteFiles(query)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the upload function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Storage} storage - Mandatory parameter
-   * @param {StringKeyword} pathString - Mandatory parameter
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<uploadResponse>}
-   */
-  upload(storage, pathString, options = undefined, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      storage
-        .bucket(identifier)
-        .upload(pathString, options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the makePublic function of storage
-   * @param {string} [identifier] - Optional parameter
-   * @param {Bucket} bucket - Mandatory parameter
-   * @returns {Promise<makePublicResponse>}
-   */
-  makePublic(bucket, identifier = undefined) {
-    return new Promise((resolve, reject) => {
-      bucket
-        .file(identifier)
-        .makePublic()
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the createBucket function of storage
-   * @param {StringKeyword} name - Mandatory parameter
-   * @param {TypeReference} [metadata] - Optional parameter
-   * @returns {Promise<createBucketResponse>}
-   */
-  create(name, metadata = undefined) {
-    return new Promise((resolve, reject) => {
-      this._storage
-        .createBucket(name, metadata)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
-  /**
-   * Trigers the getBuckets function of storage
-   * @param {TypeReference} [options] - Optional parameter
-   * @returns {Promise<getBucketsResponse>}
-   */
-  list(options = undefined) {
-    return new Promise((resolve, reject) => {
-      this._storage
-        .getBuckets(options)
-        .then(result => {
-          resolve(result);
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-  }
+	/**
+	 *
+	 * @param {object} config Configuration object
+	 */
+	constructor(config) {
+		this._storage = new Storage(config);
+	}
+	/**
+	 * Trigers the deleteFiles function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Storage} storage - Mandatory parameter
+	 * @param {TypeReference} [query] - Optional parameter
+	 * @returns {Promise<deleteFilesResponse>}
+	 */
+	deleteFiles(storage, query = undefined, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			storage
+				.bucket(identifier)
+				.deleteFiles(query)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the upload function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Storage} storage - Mandatory parameter
+	 * @param {StringKeyword} pathString - Mandatory parameter
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<uploadResponse>}
+	 */
+	upload(storage, pathString, options = undefined, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			storage
+				.bucket(identifier)
+				.upload(pathString, options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the makePublic function of storage
+	 * @param {string} [identifier] - Optional parameter
+	 * @param {Bucket} bucket - Mandatory parameter
+	 * @returns {Promise<makePublicResponse>}
+	 */
+	makePublic(bucket, identifier = undefined) {
+		return new Promise((resolve, reject) => {
+			bucket
+				.file(identifier)
+				.makePublic()
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the createBucket function of storage
+	 * @param {StringKeyword} name - Mandatory parameter
+	 * @param {TypeReference} [metadata] - Optional parameter
+	 * @returns {Promise<createBucketResponse>}
+	 */
+	create(name, metadata = undefined) {
+		return new Promise((resolve, reject) => {
+			this._storage
+				.createBucket(name, metadata)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
+	/**
+	 * Trigers the getBuckets function of storage
+	 * @param {TypeReference} [options] - Optional parameter
+	 * @returns {Promise<getBucketsResponse>}
+	 */
+	list(options = undefined) {
+		return new Promise((resolve, reject) => {
+			this._storage
+				.getBuckets(options)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(err => {
+					reject(err);
+				});
+		});
+	}
 }
 module.exports = GCP_storage;
diff --git a/generator/generators/aws/generator.js b/generator/generators/aws/generator.js
index 33d55ba9..508d06c2 100644
--- a/generator/generators/aws/generator.js
+++ b/generator/generators/aws/generator.js
@@ -1,251 +1,268 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.generateAWSClass = exports.extractSDKData = void 0;
-var fs = require("fs");
-var typescript_1 = require("typescript");
-var parser_1 = require("../../parsers/aws/parser");
-var transformer_1 = require("../../transformers/aws/transformer");
-var helper_1 = require("../lib/helper");
-var dummyFile = process.cwd() + "/dummyClasses/aws.js";
+var fs = require('fs');
+var typescript_1 = require('typescript');
+var parser_1 = require('../../parsers/aws/parser');
+var transformer_1 = require('../../transformers/aws/transformer');
+var helper_1 = require('../lib/helper');
+var dummyFile = process.cwd() + '/dummyClasses/aws.js';
 var dummyAst = typescript_1.createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  typescript_1.ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	typescript_1.ScriptTarget.Latest,
+	true
 );
 function extractSDKData(sdkClassAst, serviceClass) {
-  var methods = [];
-  var functions = [];
-  Object.keys(serviceClass).map(function(key, index) {
-    functions.push(serviceClass[key].split(" ")[1]);
-  });
-  sdkClassAst.members.map(function(method) {
-    if (method.name && functions.includes(method.name.text)) {
-      var name_1;
-      Object.keys(serviceClass).map(function(key, index) {
-        if (serviceClass[key].split(" ")[1] === method.name.text) {
-          name_1 = key;
-        }
-      });
-      var parameters_1 = [];
-      method.parameters.map(function(param) {
-        if (param.name.text !== "callback") {
-          var parameter = {
-            name: param.name.text,
-            optional: param.questionToken ? true : false,
-            type: typescript_1.SyntaxKind[param.type.kind],
-            typeName: null
-          };
-          if (parameter.type === "TypeReference" && param.type.typeName) {
-            parameter.typeName = param.type.typeName.right.text;
-          }
-          parameters_1.push(parameter);
-        }
-      });
-      methods.push({
-        functionName: name_1.toString(),
-        SDKFunctionName: method.name.text.toString(),
-        params: parameters_1
-      });
-    }
-  });
-  var groupedMethods = helper_1.groupers.aws(methods);
-  methods = helper_1.filters.aws(groupedMethods);
-  var classData = {
-    className: sdkClassAst.name.text,
-    functions: methods,
-    serviceName: null
-  };
-  return classData;
+	var methods = [];
+	var functions = [];
+	Object.keys(serviceClass).map(function(key, index) {
+		functions.push(serviceClass[key].split(' ')[1]);
+	});
+	sdkClassAst.members.map(function(method) {
+		if (method.name && functions.includes(method.name.text)) {
+			var name_1;
+			Object.keys(serviceClass).map(function(key, index) {
+				if (serviceClass[key].split(' ')[1] === method.name.text) {
+					name_1 = key;
+				}
+			});
+			var parameters_1 = [];
+			method.parameters.map(function(param) {
+				if (param.name.text !== 'callback') {
+					var parameter = {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: typescript_1.SyntaxKind[param.type.kind],
+						typeName: null,
+					};
+					if (
+						parameter.type === 'TypeReference' &&
+						param.type.typeName
+					) {
+						parameter.typeName = param.type.typeName.right.text;
+					}
+					parameters_1.push(parameter);
+				}
+			});
+			methods.push({
+				functionName: name_1.toString(),
+				SDKFunctionName: method.name.text.toString(),
+				params: parameters_1,
+			});
+		}
+	});
+	var groupedMethods = helper_1.groupers.aws(methods);
+	methods = helper_1.filters.aws(groupedMethods);
+	var classData = {
+		className: sdkClassAst.name.text,
+		functions: methods,
+		serviceName: null,
+	};
+	return classData;
 }
 exports.extractSDKData = extractSDKData;
 function generateAWSClass(serviceClass, serviceName) {
-  var _this = this;
-  var sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(" ")[0];
-  parser_1.getAST(sdkFile).then(function(result) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var sdkClassAst, classData, output, filePath, dir, e_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            sdkClassAst = result;
-            _a.label = 1;
-          case 1:
-            _a.trys.push([1, 3, , 4]);
-            classData = extractSDKData(sdkClassAst, serviceClass);
-            classData.serviceName = serviceName;
-            return [4 /*yield*/, transformer_1.transform(dummyAst, classData)];
-          case 2:
-            output = _a.sent();
-            filePath = void 0;
-            dir = helper_1.getDir(serviceName);
-            if (
-              !fs.existsSync(process.cwd() + "/generatedClasses/AWS/" + dir)
-            ) {
-              fs.mkdirSync(process.cwd() + "/generatedClasses/AWS/" + dir);
-            }
-            if (/^[A-Z]*$/.test(serviceName)) {
-              filePath =
-                process.cwd() +
-                "/generatedClasses/AWS/" +
-                dir +
-                "/aws-" +
-                serviceName +
-                ".js";
-            } else {
-              filePath =
-                process.cwd() +
-                "/generatedClasses/AWS/" +
-                dir +
-                "/aws-" +
-                serviceName.charAt(0).toLowerCase() +
-                serviceName.slice(1) +
-                ".js";
-            }
-            helper_1.printFile(filePath, output);
-            return [3 /*break*/, 4];
-          case 3:
-            e_1 = _a.sent();
-            console.error(e_1);
-            return [3 /*break*/, 4];
-          case 4:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	var sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(' ')[0];
+	parser_1.getAST(sdkFile).then(function(result) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var sdkClassAst, classData, output, filePath, dir, e_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						sdkClassAst = result;
+						_a.label = 1;
+					case 1:
+						_a.trys.push([1, 3, , 4]);
+						classData = extractSDKData(sdkClassAst, serviceClass);
+						classData.serviceName = serviceName;
+						return [
+							4 /*yield*/,
+							transformer_1.transform(dummyAst, classData),
+						];
+					case 2:
+						output = _a.sent();
+						filePath = void 0;
+						dir = helper_1.getDir(serviceName);
+						if (
+							!fs.existsSync(
+								process.cwd() + '/generatedClasses/AWS/' + dir
+							)
+						) {
+							fs.mkdirSync(
+								process.cwd() + '/generatedClasses/AWS/' + dir
+							);
+						}
+						if (/^[A-Z]*$/.test(serviceName)) {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/AWS/' +
+								dir +
+								'/aws-' +
+								serviceName +
+								'.js';
+						} else {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/AWS/' +
+								dir +
+								'/aws-' +
+								serviceName.charAt(0).toLowerCase() +
+								serviceName.slice(1) +
+								'.js';
+						}
+						helper_1.printFile(filePath, output);
+						return [3 /*break*/, 4];
+					case 3:
+						e_1 = _a.sent();
+						console.error(e_1);
+						return [3 /*break*/, 4];
+					case 4:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.generateAWSClass = generateAWSClass;
diff --git a/generator/generators/azure/generator.js b/generator/generators/azure/generator.js
index cf75bcc8..9fecc505 100644
--- a/generator/generators/azure/generator.js
+++ b/generator/generators/azure/generator.js
@@ -1,301 +1,323 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.generateAzureClass = exports.extractSDKData = void 0;
-var fs = require("fs");
-var typescript_1 = require("typescript");
-var parser_1 = require("../../parsers/azure/parser");
-var helper_1 = require("../lib/helper");
-var transformer_1 = require("../../transformers/azure/transformer");
-var dummyFile = process.cwd() + "/dummyClasses/azure.js";
+var fs = require('fs');
+var typescript_1 = require('typescript');
+var parser_1 = require('../../parsers/azure/parser');
+var transformer_1 = require('../../transformers/azure/transformer');
+var helper_1 = require('../lib/helper');
+var dummyFile = process.cwd() + '/dummyClasses/azure.js';
 var dummyAst = typescript_1.createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  typescript_1.ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	typescript_1.ScriptTarget.Latest,
+	true
 );
 function extractSDKData(sdkFiles, methods) {
-  var specifiedMethods = JSON.parse(JSON.stringify(methods));
-  sdkFiles.map(function(sdkFile) {
-    sdkFile.ast.members.map(function(member) {
-      if (typescript_1.SyntaxKind[member.kind] === "Constructor") {
-        member.parameters.map(function(param) {
-          var tempStr = param.type.typeName.text.split(/(?=[A-Z])/);
-          tempStr.pop();
-          sdkFile.client = tempStr.join("");
-        });
-      }
-      if (
-        typescript_1.SyntaxKind[member.kind] === "MethodDeclaration" &&
-        sdkFile.sdkFunctionNames.includes(member.name.text)
-      ) {
-        var method = methods.find(function(methd) {
-          return (
-            methd.SDKFunctionName === member.name.text &&
-            methd.fileName === sdkFile.fileName
-          );
-        });
-        var parameters = member.parameters.map(function(param) {
-          return {
-            name: param.name.text,
-            optional: param.questionToken ? true : false,
-            type: typescript_1.SyntaxKind[param.type.kind]
-          };
-        });
-        var returnType = typescript_1.SyntaxKind[member.type.kind];
-        if (!method.returnType) {
-          method.params = parameters;
-          method.returnType = returnType;
-          method.client = sdkFile.client;
-        } else {
-          var clone = JSON.parse(JSON.stringify(method));
-          clone.params = parameters;
-          clone.returnType = returnType;
-          clone.client = sdkFile.client;
-          methods.push(clone);
-        }
-      }
-    });
-  });
-  if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-    throw new Error("Data extraction unsuccessful");
-  }
-  var groupedMethods = helper_1.groupers.azure(methods);
-  methods = helper_1.filters.azure(groupedMethods);
-  var classData = {
-    functions: methods
-  };
-  return classData;
+	var specifiedMethods = JSON.parse(JSON.stringify(methods));
+	sdkFiles.map(function(sdkFile) {
+		sdkFile.ast.members.map(function(member) {
+			if (typescript_1.SyntaxKind[member.kind] === 'Constructor') {
+				member.parameters.map(function(param) {
+					var tempStr = param.type.typeName.text.split(/(?=[A-Z])/);
+					tempStr.pop();
+					sdkFile.client = tempStr.join('');
+				});
+			}
+			if (
+				typescript_1.SyntaxKind[member.kind] === 'MethodDeclaration' &&
+				sdkFile.sdkFunctionNames.includes(member.name.text)
+			) {
+				var method = methods.find(function(methd) {
+					return (
+						methd.SDKFunctionName === member.name.text &&
+						methd.fileName === sdkFile.fileName
+					);
+				});
+				var parameters = member.parameters.map(function(param) {
+					return {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: typescript_1.SyntaxKind[param.type.kind],
+					};
+				});
+				var returnType = typescript_1.SyntaxKind[member.type.kind];
+				if (!method.returnType) {
+					method.params = parameters;
+					method.returnType = returnType;
+					method.client = sdkFile.client;
+				} else {
+					var clone = JSON.parse(JSON.stringify(method));
+					clone.params = parameters;
+					clone.returnType = returnType;
+					clone.client = sdkFile.client;
+					methods.push(clone);
+				}
+			}
+		});
+	});
+	if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
+		throw new Error('Data extraction unsuccessful');
+	}
+	var groupedMethods = helper_1.groupers.azure(methods);
+	methods = helper_1.filters.azure(groupedMethods);
+	var classData = {
+		functions: methods,
+	};
+	return classData;
 }
 exports.extractSDKData = extractSDKData;
 function generateAzureClass(serviceClass, serviceName) {
-  return __awaiter(this, void 0, void 0, function() {
-    var methods, files, sdkFiles, classData, output, filePath, dir;
-    var _this = this;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          methods = [];
-          Object.keys(serviceClass).map(function(key, index) {
-            methods.push({
-              pkgName: serviceClass[key].split(" ")[0],
-              fileName: serviceClass[key].split(" ")[1],
-              functionName: key,
-              SDKFunctionName: serviceClass[key].split(" ")[2],
-              params: [],
-              returnType: null,
-              client: null
-            });
-          });
-          files = Array.from(
-            new Set(
-              methods.map(function(method) {
-                return method.fileName;
-              })
-            )
-          );
-          sdkFiles = files.map(function(file) {
-            return {
-              fileName: file,
-              pkgName: methods[0].pkgName,
-              ast: null,
-              client: null,
-              sdkFunctionNames: methods
-                .filter(function(method) {
-                  return method.fileName === file;
-                })
-                .map(function(method) {
-                  return method.SDKFunctionName;
-                })
-            };
-          });
-          return [
-            4 /*yield*/,
-            Promise.all(
-              sdkFiles.map(function(file) {
-                return __awaiter(_this, void 0, void 0, function() {
-                  var _a;
-                  return __generator(this, function(_b) {
-                    switch (_b.label) {
-                      case 0:
-                        _a = file;
-                        return [4 /*yield*/, parser_1.getAST(file)];
-                      case 1:
-                        _a.ast = _b.sent();
-                        return [2 /*return*/];
-                    }
-                  });
-                });
-              })
-            )
-          ];
-        case 1:
-          _a.sent();
-          classData = extractSDKData(sdkFiles, methods);
-          classData.serviceName = serviceName;
-          return [4 /*yield*/, transformer_1.transform(dummyAst, classData)];
-        case 2:
-          output = _a.sent();
-          dir = helper_1.getDir(serviceName);
-          if (
-            !fs.existsSync(process.cwd() + "/generatedClasses/Azure/" + dir)
-          ) {
-            fs.mkdirSync(process.cwd() + "/generatedClasses/Azure/" + dir);
-          }
-          if (/^[A-Z]*$/.test(serviceName)) {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/Azure/" +
-              dir +
-              "/azure-" +
-              serviceName +
-              ".js";
-          } else {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/Azure/" +
-              dir +
-              "/azure-" +
-              serviceName.charAt(0).toLowerCase() +
-              serviceName.slice(1) +
-              ".js";
-          }
-          helper_1.printFile(filePath, output);
-          return [2 /*return*/];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var methods, files, sdkFiles, classData, output, filePath, dir;
+		var _this = this;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					methods = [];
+					Object.keys(serviceClass).map(function(key, index) {
+						methods.push({
+							pkgName: serviceClass[key].split(' ')[0],
+							fileName: serviceClass[key].split(' ')[1],
+							functionName: key,
+							SDKFunctionName: serviceClass[key].split(' ')[2],
+							params: [],
+							returnType: null,
+							client: null,
+						});
+					});
+					files = Array.from(
+						new Set(
+							methods.map(function(method) {
+								return method.fileName;
+							})
+						)
+					);
+					sdkFiles = files.map(function(file) {
+						return {
+							fileName: file,
+							pkgName: methods[0].pkgName,
+							ast: null,
+							client: null,
+							sdkFunctionNames: methods
+								.filter(function(method) {
+									return method.fileName === file;
+								})
+								.map(function(method) {
+									return method.SDKFunctionName;
+								}),
+						};
+					});
+					return [
+						4 /*yield*/,
+						Promise.all(
+							sdkFiles.map(function(file) {
+								return __awaiter(
+									_this,
+									void 0,
+									void 0,
+									function() {
+										var _a;
+										return __generator(this, function(_b) {
+											switch (_b.label) {
+												case 0:
+													_a = file;
+													return [
+														4 /*yield*/,
+														parser_1.getAST(file),
+													];
+												case 1:
+													_a.ast = _b.sent();
+													return [2 /*return*/];
+											}
+										});
+									}
+								);
+							})
+						),
+					];
+				case 1:
+					_a.sent();
+					classData = extractSDKData(sdkFiles, methods);
+					classData.serviceName = serviceName;
+					return [
+						4 /*yield*/,
+						transformer_1.transform(dummyAst, classData),
+					];
+				case 2:
+					output = _a.sent();
+					dir = helper_1.getDir(serviceName);
+					if (
+						!fs.existsSync(
+							process.cwd() + '/generatedClasses/Azure/' + dir
+						)
+					) {
+						fs.mkdirSync(
+							process.cwd() + '/generatedClasses/Azure/' + dir
+						);
+					}
+					if (/^[A-Z]*$/.test(serviceName)) {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/Azure/' +
+							dir +
+							'/azure-' +
+							serviceName +
+							'.js';
+					} else {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/Azure/' +
+							dir +
+							'/azure-' +
+							serviceName.charAt(0).toLowerCase() +
+							serviceName.slice(1) +
+							'.js';
+					}
+					helper_1.printFile(filePath, output);
+					return [2 /*return*/];
+			}
+		});
+	});
 }
 exports.generateAzureClass = generateAzureClass;
diff --git a/generator/generators/azure/generator.ts b/generator/generators/azure/generator.ts
index 2aa27b60..38839d33 100644
--- a/generator/generators/azure/generator.ts
+++ b/generator/generators/azure/generator.ts
@@ -1,152 +1,152 @@
-import * as fs from "fs";
-import { createSourceFile, ScriptTarget,SyntaxKind } from "typescript";
+import * as fs from 'fs';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
 
-import { getAST } from "../../parsers/azure/parser";
-import { transform } from "../../transformers/azure/transformer";
-import { filters, getDir,groupers, printFile } from "../lib/helper";
+import { getAST } from '../../parsers/azure/parser';
+import { transform } from '../../transformers/azure/transformer';
+import { filters, getDir, groupers, printFile } from '../lib/helper';
 
 interface FunctionData {
-  pkgName: string;
-  fileName: string;
-  functionName: string;
-  SDKFunctionName: string;
-  params: param[];
-  returnType: string;
-  client: string;
+	pkgName: string;
+	fileName: string;
+	functionName: string;
+	SDKFunctionName: string;
+	params: param[];
+	returnType: string;
+	client: string;
 }
 
 interface param {
-  name: string;
-  type: string;
+	name: string;
+	type: string;
 }
 
-const dummyFile = process.cwd() + "/dummyClasses/azure.js";
+const dummyFile = process.cwd() + '/dummyClasses/azure.js';
 const dummyAst = createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	ScriptTarget.Latest,
+	true
 );
 
 export function extractSDKData(sdkFiles, methods) {
-  const specifiedMethods = JSON.parse(JSON.stringify(methods));
-  sdkFiles.map(sdkFile => {
-    sdkFile.ast.members.map(member => {
-      if (SyntaxKind[member.kind] === "Constructor") {
-        member.parameters.map(param => {
-          const tempStr = param.type.typeName.text.split(/(?=[A-Z])/);
-          tempStr.pop();
-          sdkFile.client = tempStr.join("");
-        });
-      }
-
-      if (
-        SyntaxKind[member.kind] === "MethodDeclaration" &&
-        sdkFile.sdkFunctionNames.includes(member.name.text)
-      ) {
-        const method = methods.find(
-          methd =>
-            methd.SDKFunctionName === member.name.text &&
-            methd.fileName === sdkFile.fileName
-        );
-        const parameters = member.parameters.map(param => {
-          return {
-            name: param.name.text,
-            optional: param.questionToken ? true : false,
-            type: SyntaxKind[param.type.kind]
-          };
-        });
-
-        const returnType = SyntaxKind[member.type.kind];
-        if (!method.returnType) {
-          method.params = parameters;
-          method.returnType = returnType;
-          method.client = sdkFile.client;
-        } else {
-          const clone = JSON.parse(JSON.stringify(method));
-          clone.params = parameters;
-          clone.returnType = returnType;
-          clone.client = sdkFile.client;
-          methods.push(clone);
-        }
-      }
-    });
-  });
-
-  if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-    throw new Error("Data extraction unsuccessful");
-  }
-
-  const groupedMethods = groupers.azure(methods);
-  methods = filters.azure(groupedMethods);
-
-  const classData = {
-    functions: methods
-  };
-
-  return classData;
+	const specifiedMethods = JSON.parse(JSON.stringify(methods));
+	sdkFiles.map(sdkFile => {
+		sdkFile.ast.members.map(member => {
+			if (SyntaxKind[member.kind] === 'Constructor') {
+				member.parameters.map(param => {
+					const tempStr = param.type.typeName.text.split(/(?=[A-Z])/);
+					tempStr.pop();
+					sdkFile.client = tempStr.join('');
+				});
+			}
+
+			if (
+				SyntaxKind[member.kind] === 'MethodDeclaration' &&
+				sdkFile.sdkFunctionNames.includes(member.name.text)
+			) {
+				const method = methods.find(
+					methd =>
+						methd.SDKFunctionName === member.name.text &&
+						methd.fileName === sdkFile.fileName
+				);
+				const parameters = member.parameters.map(param => {
+					return {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: SyntaxKind[param.type.kind],
+					};
+				});
+
+				const returnType = SyntaxKind[member.type.kind];
+				if (!method.returnType) {
+					method.params = parameters;
+					method.returnType = returnType;
+					method.client = sdkFile.client;
+				} else {
+					const clone = JSON.parse(JSON.stringify(method));
+					clone.params = parameters;
+					clone.returnType = returnType;
+					clone.client = sdkFile.client;
+					methods.push(clone);
+				}
+			}
+		});
+	});
+
+	if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
+		throw new Error('Data extraction unsuccessful');
+	}
+
+	const groupedMethods = groupers.azure(methods);
+	methods = filters.azure(groupedMethods);
+
+	const classData = {
+		functions: methods,
+	};
+
+	return classData;
 }
 
 export async function generateAzureClass(serviceClass, serviceName) {
-  let methods: FunctionData[] = [];
-
-  Object.keys(serviceClass).map((key, index) => {
-    methods.push({
-      pkgName: serviceClass[key].split(" ")[0],
-      fileName: serviceClass[key].split(" ")[1],
-      functionName: key,
-      SDKFunctionName: serviceClass[key].split(" ")[2],
-      params: [],
-      returnType: null,
-      client: null
-    });
-  });
-
-  const files = Array.from(new Set(methods.map(method => method.fileName)));
-
-  const sdkFiles = files.map(file => {
-    return {
-      fileName: file,
-      pkgName: methods[0].pkgName,
-      ast: null,
-      client: null,
-      sdkFunctionNames: methods
-        .filter(method => method.fileName === file)
-        .map(method => method.SDKFunctionName)
-    };
-  });
-
-  await Promise.all(
-    sdkFiles.map(async file => {
-      file.ast = await getAST(file);
-    })
-  );
-
-  const classData: any = extractSDKData(sdkFiles, methods);
-  classData.serviceName = serviceName;
-  const output = await transform(dummyAst, classData);
-  let filePath;
-  const dir = getDir(serviceName);
-  if (!fs.existsSync(process.cwd() + "/generatedClasses/Azure/" + dir)) {
-    fs.mkdirSync(process.cwd() + "/generatedClasses/Azure/" + dir);
-  }
-  if (/^[A-Z]*$/.test(serviceName)) {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/Azure/" +
-      dir +
-      "/azure-" +
-      serviceName +
-      ".js";
-  } else {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/Azure/" +
-      dir +
-      "/azure-" +
-      serviceName.charAt(0).toLowerCase() +
-      serviceName.slice(1) +
-      ".js";
-  }
-  printFile(filePath, output);
+	const methods: FunctionData[] = [];
+
+	Object.keys(serviceClass).map((key, index) => {
+		methods.push({
+			pkgName: serviceClass[key].split(' ')[0],
+			fileName: serviceClass[key].split(' ')[1],
+			functionName: key,
+			SDKFunctionName: serviceClass[key].split(' ')[2],
+			params: [],
+			returnType: null,
+			client: null,
+		});
+	});
+
+	const files = Array.from(new Set(methods.map(method => method.fileName)));
+
+	const sdkFiles = files.map(file => {
+		return {
+			fileName: file,
+			pkgName: methods[0].pkgName,
+			ast: null,
+			client: null,
+			sdkFunctionNames: methods
+				.filter(method => method.fileName === file)
+				.map(method => method.SDKFunctionName),
+		};
+	});
+
+	await Promise.all(
+		sdkFiles.map(async file => {
+			file.ast = await getAST(file);
+		})
+	);
+
+	const classData: any = extractSDKData(sdkFiles, methods);
+	classData.serviceName = serviceName;
+	const output = await transform(dummyAst, classData);
+	let filePath;
+	const dir = getDir(serviceName);
+	if (!fs.existsSync(process.cwd() + '/generatedClasses/Azure/' + dir)) {
+		fs.mkdirSync(process.cwd() + '/generatedClasses/Azure/' + dir);
+	}
+	if (/^[A-Z]*$/.test(serviceName)) {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/Azure/' +
+			dir +
+			'/azure-' +
+			serviceName +
+			'.js';
+	} else {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/Azure/' +
+			dir +
+			'/azure-' +
+			serviceName.charAt(0).toLowerCase() +
+			serviceName.slice(1) +
+			'.js';
+	}
+	printFile(filePath, output);
 }
diff --git a/generator/generators/do/generator.js b/generator/generators/do/generator.js
index 56ae7d57..f6c11156 100644
--- a/generator/generators/do/generator.js
+++ b/generator/generators/do/generator.js
@@ -1,247 +1,266 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.generateDOClass = exports.extractSDKData = void 0;
-var fs = require("fs");
-var typescript_1 = require("typescript");
-var parser_1 = require("../../parsers/do/parser");
-var transformer_1 = require("../../transformers/do/transformer");
-var helper_1 = require("../lib/helper");
-var dummyFile = process.cwd() + "/dummyClasses/do.js";
+var fs = require('fs');
+var typescript_1 = require('typescript');
+var parser_1 = require('../../parsers/do/parser');
+var transformer_1 = require('../../transformers/do/transformer');
+var helper_1 = require('../lib/helper');
+var dummyFile = process.cwd() + '/dummyClasses/do.js';
 var dummyAst = typescript_1.createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  typescript_1.ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	typescript_1.ScriptTarget.Latest,
+	true
 );
 function extractSDKData(sdkClassAst, serviceClass) {
-  var methods = [];
-  var functions = [];
-  Object.keys(serviceClass).map(function(key, index) {
-    functions.push(serviceClass[key].split(" ")[1]);
-  });
-  sdkClassAst.members.map(function(method) {
-    if (method.name && functions.includes(method.name.text)) {
-      var name_1;
-      Object.keys(serviceClass).map(function(key, index) {
-        if (serviceClass[key].split(" ")[1] === method.name.text) {
-          name_1 = key;
-        }
-      });
-      var parameters_1 = [];
-      method.parameters.map(function(param) {
-        if (param.name.text !== "callback") {
-          var parameter = {
-            name: param.name.text,
-            optional: param.questionToken ? true : false,
-            type: typescript_1.SyntaxKind[param.type.kind],
-            typeName: null
-          };
-          if (parameter.type === "TypeReference" && param.type.typeName) {
-            parameter.typeName = param.type.typeName.text;
-          }
-          parameters_1.push(parameter);
-        }
-      });
-      methods.push({
-        functionName: name_1.toString(),
-        SDKFunctionName: method.name.text.toString(),
-        params: parameters_1
-      });
-    }
-  });
-  var classData = {
-    className: sdkClassAst.name.text,
-    functions: methods,
-    serviceName: null
-  };
-  return classData;
+	var methods = [];
+	var functions = [];
+	Object.keys(serviceClass).map(function(key, index) {
+		functions.push(serviceClass[key].split(' ')[1]);
+	});
+	sdkClassAst.members.map(function(method) {
+		if (method.name && functions.includes(method.name.text)) {
+			var name_1;
+			Object.keys(serviceClass).map(function(key, index) {
+				if (serviceClass[key].split(' ')[1] === method.name.text) {
+					name_1 = key;
+				}
+			});
+			var parameters_1 = [];
+			method.parameters.map(function(param) {
+				if (param.name.text !== 'callback') {
+					var parameter = {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: typescript_1.SyntaxKind[param.type.kind],
+						typeName: null,
+					};
+					if (
+						parameter.type === 'TypeReference' &&
+						param.type.typeName
+					) {
+						parameter.typeName = param.type.typeName.text;
+					}
+					parameters_1.push(parameter);
+				}
+			});
+			methods.push({
+				functionName: name_1.toString(),
+				SDKFunctionName: method.name.text.toString(),
+				params: parameters_1,
+			});
+		}
+	});
+	var classData = {
+		className: sdkClassAst.name.text,
+		functions: methods,
+		serviceName: null,
+	};
+	return classData;
 }
 exports.extractSDKData = extractSDKData;
 function generateDOClass(serviceClass, serviceName) {
-  var _this = this;
-  var sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(" ")[0];
-  parser_1.getAST(sdkFile).then(function(result) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var sdkClassAst, classData, output, filePath, dir, e_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            sdkClassAst = result;
-            _a.label = 1;
-          case 1:
-            _a.trys.push([1, 3, , 4]);
-            classData = extractSDKData(sdkClassAst, serviceClass);
-            classData.serviceName = serviceName;
-            return [4 /*yield*/, transformer_1.transform(dummyAst, classData)];
-          case 2:
-            output = _a.sent();
-            filePath = void 0;
-            dir = helper_1.getDir(serviceName);
-            if (!fs.existsSync(process.cwd() + "/generatedClasses/DO/" + dir)) {
-              fs.mkdirSync(process.cwd() + "/generatedClasses/DO/" + dir);
-            }
-            if (/^[A-Z]*$/.test(serviceName)) {
-              filePath =
-                process.cwd() +
-                "/generatedClasses/DO/" +
-                dir +
-                "/do-" +
-                serviceName +
-                ".js";
-            } else {
-              filePath =
-                process.cwd() +
-                "/generatedClasses/DO/" +
-                dir +
-                "/do-" +
-                serviceName.charAt(0).toLowerCase() +
-                serviceName.slice(1) +
-                ".js";
-            }
-            helper_1.printFile(filePath, output);
-            return [3 /*break*/, 4];
-          case 3:
-            e_1 = _a.sent();
-            console.error(e_1);
-            return [3 /*break*/, 4];
-          case 4:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	var sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(' ')[0];
+	parser_1.getAST(sdkFile).then(function(result) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var sdkClassAst, classData, output, filePath, dir, e_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						sdkClassAst = result;
+						_a.label = 1;
+					case 1:
+						_a.trys.push([1, 3, , 4]);
+						classData = extractSDKData(sdkClassAst, serviceClass);
+						classData.serviceName = serviceName;
+						return [
+							4 /*yield*/,
+							transformer_1.transform(dummyAst, classData),
+						];
+					case 2:
+						output = _a.sent();
+						filePath = void 0;
+						dir = helper_1.getDir(serviceName);
+						if (
+							!fs.existsSync(
+								process.cwd() + '/generatedClasses/DO/' + dir
+							)
+						) {
+							fs.mkdirSync(
+								process.cwd() + '/generatedClasses/DO/' + dir
+							);
+						}
+						if (/^[A-Z]*$/.test(serviceName)) {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/DO/' +
+								dir +
+								'/do-' +
+								serviceName +
+								'.js';
+						} else {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/DO/' +
+								dir +
+								'/do-' +
+								serviceName.charAt(0).toLowerCase() +
+								serviceName.slice(1) +
+								'.js';
+						}
+						helper_1.printFile(filePath, output);
+						return [3 /*break*/, 4];
+					case 3:
+						e_1 = _a.sent();
+						console.error(e_1);
+						return [3 /*break*/, 4];
+					case 4:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.generateDOClass = generateDOClass;
diff --git a/generator/generators/do/generator.ts b/generator/generators/do/generator.ts
index 052b13e0..7a97277d 100644
--- a/generator/generators/do/generator.ts
+++ b/generator/generators/do/generator.ts
@@ -1,123 +1,129 @@
-import * as fs from "fs";
-import { createSourceFile, ScriptTarget, SyntaxKind } from "typescript";
+import * as fs from 'fs';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
 
-import { getAST } from "../../parsers/do/parser";
-import { transform } from "../../transformers/do/transformer";
-import { getDir,printFile } from "../lib/helper";
+import { getAST } from '../../parsers/do/parser';
+import { transform } from '../../transformers/do/transformer';
+import { getDir, printFile } from '../lib/helper';
 
 interface FunctionData {
-  functionName: string;
-  SDKFunctionName: string;
-  params: param[];
+	functionName: string;
+	SDKFunctionName: string;
+	params: param[];
 }
 
 interface param {
-  name: string;
-  type: string;
-  typeName: string;
+	name: string;
+	type: string;
+	typeName: string;
 }
 
 interface ClassData {
-  className: string;
-  functions: FunctionData[];
-  serviceName: string;
+	className: string;
+	functions: FunctionData[];
+	serviceName: string;
 }
 
-const dummyFile = process.cwd() + "/dummyClasses/do.js";
+const dummyFile = process.cwd() + '/dummyClasses/do.js';
 
 const dummyAst = createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	ScriptTarget.Latest,
+	true
 );
 
 export function extractSDKData(sdkClassAst, serviceClass) {
-  let methods: FunctionData[] = [];
-  const functions = [];
-
-  Object.keys(serviceClass).map((key, index) => {
-    functions.push(serviceClass[key].split(" ")[1]);
-  });
-
-  sdkClassAst.members.map(method => {
-    if (method.name && functions.includes(method.name.text)) {
-      let name;
-      Object.keys(serviceClass).map((key, index) => {
-        if (serviceClass[key].split(" ")[1] === method.name.text) {
-          name = key;
-        }
-      });
-
-      const parameters = [];
-      method.parameters.map(param => {
-        if (param.name.text !== "callback") {
-          const parameter = {
-            name: param.name.text,
-            optional: param.questionToken ? true : false,
-            type: SyntaxKind[param.type.kind],
-            typeName: null
-          };
-
-          if (parameter.type === "TypeReference" && param.type.typeName) {
-            parameter.typeName = param.type.typeName.text;
-          }
-
-          parameters.push(parameter);
-        }
-      });
-
-      methods.push({
-        functionName: name.toString(),
-        SDKFunctionName: method.name.text.toString(),
-        params: parameters
-      });
-    }
-  });
-
-  const classData: ClassData = {
-    className: sdkClassAst.name.text,
-    functions: methods,
-    serviceName: null
-  };
-
-  return classData;
+	const methods: FunctionData[] = [];
+	const functions = [];
+
+	Object.keys(serviceClass).map((key, index) => {
+		functions.push(serviceClass[key].split(' ')[1]);
+	});
+
+	sdkClassAst.members.map(method => {
+		if (method.name && functions.includes(method.name.text)) {
+			let name;
+			Object.keys(serviceClass).map((key, index) => {
+				if (serviceClass[key].split(' ')[1] === method.name.text) {
+					name = key;
+				}
+			});
+
+			const parameters = [];
+			method.parameters.map(param => {
+				if (param.name.text !== 'callback') {
+					const parameter = {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: SyntaxKind[param.type.kind],
+						typeName: null,
+					};
+
+					if (
+						parameter.type === 'TypeReference' &&
+						param.type.typeName
+					) {
+						parameter.typeName = param.type.typeName.text;
+					}
+
+					parameters.push(parameter);
+				}
+			});
+
+			methods.push({
+				functionName: name.toString(),
+				SDKFunctionName: method.name.text.toString(),
+				params: parameters,
+			});
+		}
+	});
+
+	const classData: ClassData = {
+		className: sdkClassAst.name.text,
+		functions: methods,
+		serviceName: null,
+	};
+
+	return classData;
 }
 
 export function generateDOClass(serviceClass, serviceName) {
-  const sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(" ")[0];
-  getAST(sdkFile).then(async result => {
-    const sdkClassAst = result;
-    try {
-      const classData: ClassData = extractSDKData(sdkClassAst, serviceClass);
-      classData.serviceName = serviceName;
-      const output = await transform(dummyAst, classData);
-      let filePath;
-      const dir = getDir(serviceName);
-      if (!fs.existsSync(process.cwd() + "/generatedClasses/DO/" + dir)) {
-        fs.mkdirSync(process.cwd() + "/generatedClasses/DO/" + dir);
-      }
-      if (/^[A-Z]*$/.test(serviceName)) {
-        filePath =
-          process.cwd() +
-          "/generatedClasses/DO/" +
-          dir +
-          "/do-" +
-          serviceName +
-          ".js";
-      } else {
-        filePath =
-          process.cwd() +
-          "/generatedClasses/DO/" +
-          dir +
-          "/do-" +
-          serviceName.charAt(0).toLowerCase() +
-          serviceName.slice(1) +
-          ".js";
-      }
-      printFile(filePath, output);
-    } catch (e) {
-      console.error(e);
-    }
-  });
+	const sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(' ')[0];
+	getAST(sdkFile).then(async result => {
+		const sdkClassAst = result;
+		try {
+			const classData: ClassData = extractSDKData(
+				sdkClassAst,
+				serviceClass
+			);
+			classData.serviceName = serviceName;
+			const output = await transform(dummyAst, classData);
+			let filePath;
+			const dir = getDir(serviceName);
+			if (!fs.existsSync(process.cwd() + '/generatedClasses/DO/' + dir)) {
+				fs.mkdirSync(process.cwd() + '/generatedClasses/DO/' + dir);
+			}
+			if (/^[A-Z]*$/.test(serviceName)) {
+				filePath =
+					process.cwd() +
+					'/generatedClasses/DO/' +
+					dir +
+					'/do-' +
+					serviceName +
+					'.js';
+			} else {
+				filePath =
+					process.cwd() +
+					'/generatedClasses/DO/' +
+					dir +
+					'/do-' +
+					serviceName.charAt(0).toLowerCase() +
+					serviceName.slice(1) +
+					'.js';
+			}
+			printFile(filePath, output);
+		} catch (e) {
+			console.error(e);
+		}
+	});
 }
diff --git a/generator/generators/googleCloud/generator.js b/generator/generators/googleCloud/generator.js
index 664103f9..ea5d502a 100644
--- a/generator/generators/googleCloud/generator.js
+++ b/generator/generators/googleCloud/generator.js
@@ -1,594 +1,701 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.generateGCPClass = exports.extractClientBasedSDKdata = exports.extractClassBasedSDKData = void 0;
-var fs = require("fs");
-var path = require("path");
-var typescript_1 = require("typescript");
-var parser_1 = require("../../parsers/googleCloud/parser");
-var helper_1 = require("../lib/helper");
-var clientBasedTransformer_1 = require("../../transformers/googleCloud/clientBasedTransformer");
-var classBasedTransformer_1 = require("../../transformers/googleCloud/classBasedTransformer");
-var dummyFile = process.cwd() + "/dummyClasses/gcp.js";
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
+var parser_1 = require('../../parsers/googleCloud/parser');
+var classBasedTransformer_1 = require('../../transformers/googleCloud/classBasedTransformer');
+var clientBasedTransformer_1 = require('../../transformers/googleCloud/clientBasedTransformer');
+var helper_1 = require('../lib/helper');
+var dummyFile = process.cwd() + '/dummyClasses/gcp.js';
 var dummyAst = typescript_1.createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  typescript_1.ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	typescript_1.ScriptTarget.Latest,
+	true
 );
 function extractClassBasedSDKData(methods, sdkFiles) {
-  var _this = this;
-  var specifiedMethods = JSON.parse(JSON.stringify(methods));
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var classes_1, extractedData;
-      return __generator(this, function(_a) {
-        try {
-          classes_1 = [];
-          sdkFiles.map(function(file) {
-            file.classes.map(function(classAst) {
-              var classInfo = {
-                name: classAst.name.text,
-                methods: [],
-                properties: [],
-                constructor: null
-              };
-              classAst.members.map(function(member) {
-                if (
-                  typescript_1.SyntaxKind[member.kind] === "MethodDeclaration"
-                ) {
-                  var returnType = typescript_1.SyntaxKind[member.type.kind];
-                  var parameters = member.parameters.map(function(param) {
-                    return {
-                      name: param.name.text,
-                      optional: param.questionToken ? true : false,
-                      type: typescript_1.SyntaxKind[param.type.kind]
-                    };
-                  });
-                  var method_1 = {
-                    pkgName: file.pkgName,
-                    version: null,
-                    fileName: file.fileName,
-                    functionName: null,
-                    SDKFunctionName: member.name.text,
-                    params: parameters,
-                    returnType: returnType,
-                    returnTypeName: null,
-                    client: classAst.name.text // Class name
-                  };
-                  if (returnType === "TypeReference") {
-                    method_1.returnTypeName = member.type.typeName.text;
-                  }
-                  var meth = methods.find(function(meth) {
-                    return (
-                      meth.SDKFunctionName === method_1.SDKFunctionName &&
-                      meth.fileName === method_1.fileName
-                    );
-                  });
-                  method_1.functionName = meth ? meth.functionName : null;
-                  classInfo.methods.push(method_1);
-                }
-                if (typescript_1.SyntaxKind[member.kind] === "Constructor") {
-                  var parameters = member.parameters.map(function(param) {
-                    return {
-                      name: param.name.text,
-                      optional: param.questionToken ? true : false,
-                      type: typescript_1.SyntaxKind[param.type.kind],
-                      typeRefName: param.type.typeName
-                        ? param.type.typeName.text
-                        : null
-                    };
-                  });
-                  classInfo.constructor = {
-                    parameters: parameters
-                  };
-                }
-                if (
-                  typescript_1.SyntaxKind[member.kind] === "PropertyDeclaration"
-                ) {
-                  var isPrivateProp =
-                    member.modifiers &&
-                    member.modifiers.some(function(modifier) {
-                      return (
-                        typescript_1.SyntaxKind[modifier.kind] ===
-                        "PrivateKeyword"
-                      );
-                    });
-                  if (!isPrivateProp) {
-                    var prop = {
-                      name: member.name.text,
-                      type: typescript_1.SyntaxKind[member.type.kind],
-                      typeRefName: member.type.typeName
-                        ? member.type.typeName.text
-                        : null
-                    };
-                    classInfo.properties.push(prop);
-                  }
-                }
-              });
-              classes_1.push(classInfo);
-            });
-          });
-          methods = [];
-          classes_1.map(function(classData) {
-            var filteredMethods = classData.methods.filter(function(meth) {
-              return meth.functionName !== null;
-            });
-            filteredMethods.map(function(filMeth) {
-              filMeth.classConstructorData = classData.constructor;
-            });
-            methods = methods.concat(filteredMethods);
-          });
-          extractedData = {
-            classes: classes_1,
-            methods: methods
-          };
-          if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-            reject(new Error("Data extraction unsuccessful"));
-          } else {
-            resolve(extractedData);
-          }
-        } catch (error) {
-          reject(error);
-        }
-        return [2 /*return*/];
-      });
-    });
-  });
+	var _this = this;
+	var specifiedMethods = JSON.parse(JSON.stringify(methods));
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var classes_1, extractedData;
+			return __generator(this, function(_a) {
+				try {
+					classes_1 = [];
+					sdkFiles.map(function(file) {
+						file.classes.map(function(classAst) {
+							var classInfo = {
+								name: classAst.name.text,
+								methods: [],
+								properties: [],
+								constructor: null,
+							};
+							classAst.members.map(function(member) {
+								if (
+									typescript_1.SyntaxKind[member.kind] ===
+									'MethodDeclaration'
+								) {
+									var returnType =
+										typescript_1.SyntaxKind[
+											member.type.kind
+										];
+									var parameters = member.parameters.map(
+										function(param) {
+											return {
+												name: param.name.text,
+												optional: param.questionToken
+													? true
+													: false,
+												type:
+													typescript_1.SyntaxKind[
+														param.type.kind
+													],
+											};
+										}
+									);
+									var method_1 = {
+										pkgName: file.pkgName,
+										version: null,
+										fileName: file.fileName,
+										functionName: null,
+										SDKFunctionName: member.name.text,
+										params: parameters,
+										returnType: returnType,
+										returnTypeName: null,
+										client: classAst.name.text, // Class name
+									};
+									if (returnType === 'TypeReference') {
+										method_1.returnTypeName =
+											member.type.typeName.text;
+									}
+									var meth = methods.find(function(meth) {
+										return (
+											meth.SDKFunctionName ===
+												method_1.SDKFunctionName &&
+											meth.fileName === method_1.fileName
+										);
+									});
+									method_1.functionName = meth
+										? meth.functionName
+										: null;
+									classInfo.methods.push(method_1);
+								}
+								if (
+									typescript_1.SyntaxKind[member.kind] ===
+									'Constructor'
+								) {
+									var parameters = member.parameters.map(
+										function(param) {
+											return {
+												name: param.name.text,
+												optional: param.questionToken
+													? true
+													: false,
+												type:
+													typescript_1.SyntaxKind[
+														param.type.kind
+													],
+												typeRefName: param.type.typeName
+													? param.type.typeName.text
+													: null,
+											};
+										}
+									);
+									classInfo.constructor = {
+										parameters: parameters,
+									};
+								}
+								if (
+									typescript_1.SyntaxKind[member.kind] ===
+									'PropertyDeclaration'
+								) {
+									var isPrivateProp =
+										member.modifiers &&
+										member.modifiers.some(function(
+											modifier
+										) {
+											return (
+												typescript_1.SyntaxKind[
+													modifier.kind
+												] === 'PrivateKeyword'
+											);
+										});
+									if (!isPrivateProp) {
+										var prop = {
+											name: member.name.text,
+											type:
+												typescript_1.SyntaxKind[
+													member.type.kind
+												],
+											typeRefName: member.type.typeName
+												? member.type.typeName.text
+												: null,
+										};
+										classInfo.properties.push(prop);
+									}
+								}
+							});
+							classes_1.push(classInfo);
+						});
+					});
+					methods = [];
+					classes_1.map(function(classData) {
+						var filteredMethods = classData.methods.filter(function(
+							meth
+						) {
+							return meth.functionName !== null;
+						});
+						filteredMethods.map(function(filMeth) {
+							filMeth.classConstructorData =
+								classData.constructor;
+						});
+						methods = methods.concat(filteredMethods);
+					});
+					extractedData = {
+						classes: classes_1,
+						methods: methods,
+					};
+					if (
+						JSON.stringify(methods) ===
+						JSON.stringify(specifiedMethods)
+					) {
+						reject(new Error('Data extraction unsuccessful'));
+					} else {
+						resolve(extractedData);
+					}
+				} catch (error) {
+					reject(error);
+				}
+				return [2 /*return*/];
+			});
+		});
+	});
 }
 exports.extractClassBasedSDKData = extractClassBasedSDKData;
 function extractClientBasedSDKdata(methods, sdkFiles) {
-  var _this = this;
-  var specifiedMethods = JSON.parse(JSON.stringify(methods));
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      return __generator(this, function(_a) {
-        try {
-          sdkFiles.map(function(sdkFile) {
-            sdkFile.client = sdkFile.ast.name.text;
-            sdkFile.ast.members.map(function(member) {
-              if (
-                typescript_1.SyntaxKind[member.kind] === "MethodDeclaration" &&
-                sdkFile.sdkFunctionNames.includes(member.name.text)
-              ) {
-                var method = methods.find(function(methd) {
-                  return methd.SDKFunctionName === member.name.text;
-                });
-                var parameters = member.parameters.map(function(param) {
-                  return {
-                    name: param.name.text,
-                    optional: param.questionToken ? true : false,
-                    type: typescript_1.SyntaxKind[param.type.kind]
-                  };
-                });
-                var returnType = typescript_1.SyntaxKind[member.type.kind];
-                if (returnType === "TypeReference") {
-                  method.returnTypeName = member.type.typeName.text;
-                }
-                if (!method.returnType) {
-                  method.params = parameters;
-                  method.returnType = returnType;
-                  method.client = sdkFile.client;
-                } else {
-                  var clone = JSON.parse(JSON.stringify(method));
-                  clone.params = parameters;
-                  clone.returnType = returnType;
-                  clone.client = sdkFile.client;
-                  methods.push(clone);
-                }
-              }
-            });
-          });
-          if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-            reject(new Error("Data extraction unsuccessful"));
-          } else {
-            resolve(methods);
-          }
-        } catch (error) {
-          reject(error);
-        }
-        return [2 /*return*/];
-      });
-    });
-  });
+	var _this = this;
+	var specifiedMethods = JSON.parse(JSON.stringify(methods));
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			return __generator(this, function(_a) {
+				try {
+					sdkFiles.map(function(sdkFile) {
+						sdkFile.client = sdkFile.ast.name.text;
+						sdkFile.ast.members.map(function(member) {
+							if (
+								typescript_1.SyntaxKind[member.kind] ===
+									'MethodDeclaration' &&
+								sdkFile.sdkFunctionNames.includes(
+									member.name.text
+								)
+							) {
+								var method = methods.find(function(methd) {
+									return (
+										methd.SDKFunctionName ===
+										member.name.text
+									);
+								});
+								var parameters = member.parameters.map(function(
+									param
+								) {
+									return {
+										name: param.name.text,
+										optional: param.questionToken
+											? true
+											: false,
+										type:
+											typescript_1.SyntaxKind[
+												param.type.kind
+											],
+									};
+								});
+								var returnType =
+									typescript_1.SyntaxKind[member.type.kind];
+								if (returnType === 'TypeReference') {
+									method.returnTypeName =
+										member.type.typeName.text;
+								}
+								if (!method.returnType) {
+									method.params = parameters;
+									method.returnType = returnType;
+									method.client = sdkFile.client;
+								} else {
+									var clone = JSON.parse(
+										JSON.stringify(method)
+									);
+									clone.params = parameters;
+									clone.returnType = returnType;
+									clone.client = sdkFile.client;
+									methods.push(clone);
+								}
+							}
+						});
+					});
+					if (
+						JSON.stringify(methods) ===
+						JSON.stringify(specifiedMethods)
+					) {
+						reject(new Error('Data extraction unsuccessful'));
+					} else {
+						resolve(methods);
+					}
+				} catch (error) {
+					reject(error);
+				}
+				return [2 /*return*/];
+			});
+		});
+	});
 }
 exports.extractClientBasedSDKdata = extractClientBasedSDKdata;
 function generateClassBasedCode(methods, data, serviceName) {
-  return __awaiter(this, void 0, void 0, function() {
-    var dirPath,
-      files,
-      sdkFiles,
-      extractedData,
-      groupedMethods,
-      output,
-      filePath,
-      dir;
-    var _this = this;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          dirPath =
-            "../../../node_modules/@google-cloud/" +
-            methods[0].pkgName +
-            "/build/src/";
-          files = fs.readdirSync(path.join(__dirname, dirPath));
-          files = files.filter(function(fileName) {
-            return (
-              fileName.split(".")[1] === "d" && fileName.split(".")[2] === "ts"
-            );
-          });
-          sdkFiles = files.map(function(fileName) {
-            return {
-              fileName: fileName,
-              pkgName: methods[0].pkgName,
-              classes: null,
-              sdkFunctionNames: methods
-                .filter(function(method) {
-                  return method.fileName === fileName;
-                })
-                .map(function(method) {
-                  return method.SDKFunctionName;
-                })
-            };
-          });
-          return [
-            4 /*yield*/,
-            Promise.all(
-              sdkFiles.map(function(file) {
-                return __awaiter(_this, void 0, void 0, function() {
-                  var _a;
-                  return __generator(this, function(_b) {
-                    switch (_b.label) {
-                      case 0:
-                        _a = file;
-                        return [4 /*yield*/, parser_1.getAST(file, true)];
-                      case 1:
-                        _a.classes = _b.sent();
-                        return [2 /*return*/];
-                    }
-                  });
-                });
-              })
-            )
-          ];
-        case 1:
-          _a.sent();
-          return [
-            4 /*yield*/,
-            extractClassBasedSDKData(methods, sdkFiles).then(function(result) {
-              return result;
-            })
-          ];
-        case 2:
-          extractedData = _a.sent();
-          groupedMethods = helper_1.groupers.gcp(extractedData.methods);
-          methods = helper_1.filters.gcp(groupedMethods);
-          data.functions = methods;
-          data.classData = extractedData.classes;
-          data.serviceName = serviceName;
-          return [
-            4 /*yield*/,
-            classBasedTransformer_1.classBasedTransform(dummyAst, data)
-          ];
-        case 3:
-          output = _a.sent();
-          dir = helper_1.getDir(serviceName);
-          if (
-            !fs.existsSync(
-              process.cwd() + "/generatedClasses/googleCloud/" + dir
-            )
-          ) {
-            fs.mkdirSync(
-              process.cwd() + "/generatedClasses/googleCloud/" + dir
-            );
-          }
-          if (/^[A-Z]*$/.test(serviceName)) {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/googleCloud/" +
-              dir +
-              "/gcp-" +
-              serviceName +
-              ".js";
-          } else {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/googleCloud/" +
-              dir +
-              "/gcp-" +
-              serviceName.charAt(0).toLowerCase() +
-              serviceName.slice(1) +
-              ".js";
-          }
-          helper_1.printFile(filePath, output);
-          return [2 /*return*/];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var dirPath,
+			files,
+			sdkFiles,
+			extractedData,
+			groupedMethods,
+			output,
+			filePath,
+			dir;
+		var _this = this;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					dirPath =
+						'../../../node_modules/@google-cloud/' +
+						methods[0].pkgName +
+						'/build/src/';
+					files = fs.readdirSync(path.join(__dirname, dirPath));
+					files = files.filter(function(fileName) {
+						return (
+							fileName.split('.')[1] === 'd' &&
+							fileName.split('.')[2] === 'ts'
+						);
+					});
+					sdkFiles = files.map(function(fileName) {
+						return {
+							fileName: fileName,
+							pkgName: methods[0].pkgName,
+							classes: null,
+							sdkFunctionNames: methods
+								.filter(function(method) {
+									return method.fileName === fileName;
+								})
+								.map(function(method) {
+									return method.SDKFunctionName;
+								}),
+						};
+					});
+					return [
+						4 /*yield*/,
+						Promise.all(
+							sdkFiles.map(function(file) {
+								return __awaiter(
+									_this,
+									void 0,
+									void 0,
+									function() {
+										var _a;
+										return __generator(this, function(_b) {
+											switch (_b.label) {
+												case 0:
+													_a = file;
+													return [
+														4 /*yield*/,
+														parser_1.getAST(
+															file,
+															true
+														),
+													];
+												case 1:
+													_a.classes = _b.sent();
+													return [2 /*return*/];
+											}
+										});
+									}
+								);
+							})
+						),
+					];
+				case 1:
+					_a.sent();
+					return [
+						4 /*yield*/,
+						extractClassBasedSDKData(methods, sdkFiles).then(
+							function(result) {
+								return result;
+							}
+						),
+					];
+				case 2:
+					extractedData = _a.sent();
+					groupedMethods = helper_1.groupers.gcp(
+						extractedData.methods
+					);
+					methods = helper_1.filters.gcp(groupedMethods);
+					data.functions = methods;
+					data.classData = extractedData.classes;
+					data.serviceName = serviceName;
+					return [
+						4 /*yield*/,
+						classBasedTransformer_1.classBasedTransform(
+							dummyAst,
+							data
+						),
+					];
+				case 3:
+					output = _a.sent();
+					dir = helper_1.getDir(serviceName);
+					if (
+						!fs.existsSync(
+							process.cwd() +
+								'/generatedClasses/googleCloud/' +
+								dir
+						)
+					) {
+						fs.mkdirSync(
+							process.cwd() +
+								'/generatedClasses/googleCloud/' +
+								dir
+						);
+					}
+					if (/^[A-Z]*$/.test(serviceName)) {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/googleCloud/' +
+							dir +
+							'/gcp-' +
+							serviceName +
+							'.js';
+					} else {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/googleCloud/' +
+							dir +
+							'/gcp-' +
+							serviceName.charAt(0).toLowerCase() +
+							serviceName.slice(1) +
+							'.js';
+					}
+					helper_1.printFile(filePath, output);
+					return [2 /*return*/];
+			}
+		});
+	});
 }
 function generateClientBasedCode(methods, serviceName) {
-  return __awaiter(this, void 0, void 0, function() {
-    var files, sdkFiles, groupedMethods, classData, output, filePath, dir;
-    var _this = this;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          files = Array.from(
-            new Set(
-              methods.map(function(method) {
-                return method.fileName + " " + method.version;
-              })
-            )
-          );
-          sdkFiles = files.map(function(file) {
-            return {
-              fileName: file.split(" ")[0],
-              version: file.split(" ")[1],
-              pkgName: methods[0].pkgName,
-              ast: null,
-              client: null,
-              sdkFunctionNames: methods
-                .filter(function(method) {
-                  return method.fileName === file.split(" ")[0];
-                })
-                .map(function(method) {
-                  return method.SDKFunctionName;
-                })
-            };
-          });
-          return [
-            4 /*yield*/,
-            Promise.all(
-              sdkFiles.map(function(file) {
-                return __awaiter(_this, void 0, void 0, function() {
-                  var _a;
-                  return __generator(this, function(_b) {
-                    switch (_b.label) {
-                      case 0:
-                        _a = file;
-                        return [4 /*yield*/, parser_1.getAST(file)];
-                      case 1:
-                        _a.ast = _b.sent();
-                        return [2 /*return*/];
-                    }
-                  });
-                });
-              })
-            )
-          ];
-        case 1:
-          _a.sent();
-          return [
-            4 /*yield*/,
-            extractClientBasedSDKdata(methods, sdkFiles).then(function(result) {
-              return result;
-            })
-          ];
-        case 2:
-          methods = _a.sent();
-          groupedMethods = helper_1.groupers.gcp(methods);
-          methods = helper_1.filters.gcp(groupedMethods);
-          classData = {
-            functions: methods,
-            serviceName: serviceName
-          };
-          return [
-            4 /*yield*/,
-            clientBasedTransformer_1.clientBasedTransform(dummyAst, classData)
-          ];
-        case 3:
-          output = _a.sent();
-          dir = helper_1.getDir(serviceName);
-          if (
-            !fs.existsSync(
-              process.cwd() + "/generatedClasses/googleCloud/" + dir
-            )
-          ) {
-            fs.mkdirSync(
-              process.cwd() + "/generatedClasses/googleCloud/" + dir
-            );
-          }
-          if (/^[A-Z]*$/.test(serviceName)) {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/googleCloud/" +
-              dir +
-              "/gcp-" +
-              serviceName +
-              ".js";
-          } else {
-            filePath =
-              process.cwd() +
-              "/generatedClasses/googleCloud/" +
-              dir +
-              "/gcp-" +
-              serviceName.charAt(0).toLowerCase() +
-              serviceName.slice(1) +
-              ".js";
-          }
-          helper_1.printFile(filePath, output);
-          return [2 /*return*/];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var files, sdkFiles, groupedMethods, classData, output, filePath, dir;
+		var _this = this;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					files = Array.from(
+						new Set(
+							methods.map(function(method) {
+								return method.fileName + ' ' + method.version;
+							})
+						)
+					);
+					sdkFiles = files.map(function(file) {
+						return {
+							fileName: file.split(' ')[0],
+							version: file.split(' ')[1],
+							pkgName: methods[0].pkgName,
+							ast: null,
+							client: null,
+							sdkFunctionNames: methods
+								.filter(function(method) {
+									return (
+										method.fileName === file.split(' ')[0]
+									);
+								})
+								.map(function(method) {
+									return method.SDKFunctionName;
+								}),
+						};
+					});
+					return [
+						4 /*yield*/,
+						Promise.all(
+							sdkFiles.map(function(file) {
+								return __awaiter(
+									_this,
+									void 0,
+									void 0,
+									function() {
+										var _a;
+										return __generator(this, function(_b) {
+											switch (_b.label) {
+												case 0:
+													_a = file;
+													return [
+														4 /*yield*/,
+														parser_1.getAST(file),
+													];
+												case 1:
+													_a.ast = _b.sent();
+													return [2 /*return*/];
+											}
+										});
+									}
+								);
+							})
+						),
+					];
+				case 1:
+					_a.sent();
+					return [
+						4 /*yield*/,
+						extractClientBasedSDKdata(methods, sdkFiles).then(
+							function(result) {
+								return result;
+							}
+						),
+					];
+				case 2:
+					methods = _a.sent();
+					groupedMethods = helper_1.groupers.gcp(methods);
+					methods = helper_1.filters.gcp(groupedMethods);
+					classData = {
+						functions: methods,
+						serviceName: serviceName,
+					};
+					return [
+						4 /*yield*/,
+						clientBasedTransformer_1.clientBasedTransform(
+							dummyAst,
+							classData
+						),
+					];
+				case 3:
+					output = _a.sent();
+					dir = helper_1.getDir(serviceName);
+					if (
+						!fs.existsSync(
+							process.cwd() +
+								'/generatedClasses/googleCloud/' +
+								dir
+						)
+					) {
+						fs.mkdirSync(
+							process.cwd() +
+								'/generatedClasses/googleCloud/' +
+								dir
+						);
+					}
+					if (/^[A-Z]*$/.test(serviceName)) {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/googleCloud/' +
+							dir +
+							'/gcp-' +
+							serviceName +
+							'.js';
+					} else {
+						filePath =
+							process.cwd() +
+							'/generatedClasses/googleCloud/' +
+							dir +
+							'/gcp-' +
+							serviceName.charAt(0).toLowerCase() +
+							serviceName.slice(1) +
+							'.js';
+					}
+					helper_1.printFile(filePath, output);
+					return [2 /*return*/];
+			}
+		});
+	});
 }
 function generateGCPClass(serviceClass, serviceName) {
-  return __awaiter(this, void 0, void 0, function() {
-    var methods, data;
-    return __generator(this, function(_a) {
-      methods = [];
-      data = {};
-      Object.keys(serviceClass).map(function(key, index) {
-        if (key === "mainClass") {
-          data.mainClass = serviceClass[key];
-        } else if (
-          serviceClass[key].split(" ")[1].length === 2 &&
-          serviceClass[key].split(" ")[1].charAt(0) === "v"
-        ) {
-          methods.push({
-            pkgName: serviceClass[key].split(" ")[0],
-            version: serviceClass[key].split(" ")[1],
-            fileName: serviceClass[key].split(" ")[2],
-            functionName: key,
-            SDKFunctionName: serviceClass[key].split(" ")[3],
-            params: [],
-            returnType: null,
-            returnTypeName: null,
-            client: null
-          });
-        } else {
-          methods.push({
-            pkgName: serviceClass[key].split(" ")[0],
-            version: null,
-            fileName: serviceClass[key].split(" ")[1],
-            functionName: key,
-            SDKFunctionName: serviceClass[key].split(" ")[2],
-            params: [],
-            returnType: null,
-            returnTypeName: null,
-            client: null
-          });
-        }
-      });
-      if (methods[0].version) {
-        generateClientBasedCode(methods, serviceName);
-      } else {
-        generateClassBasedCode(methods, data, serviceName);
-      }
-      return [2 /*return*/];
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var methods, data;
+		return __generator(this, function(_a) {
+			methods = [];
+			data = {};
+			Object.keys(serviceClass).map(function(key, index) {
+				if (key === 'mainClass') {
+					data.mainClass = serviceClass[key];
+				} else if (
+					serviceClass[key].split(' ')[1].length === 2 &&
+					serviceClass[key].split(' ')[1].charAt(0) === 'v'
+				) {
+					methods.push({
+						pkgName: serviceClass[key].split(' ')[0],
+						version: serviceClass[key].split(' ')[1],
+						fileName: serviceClass[key].split(' ')[2],
+						functionName: key,
+						SDKFunctionName: serviceClass[key].split(' ')[3],
+						params: [],
+						returnType: null,
+						returnTypeName: null,
+						client: null,
+					});
+				} else {
+					methods.push({
+						pkgName: serviceClass[key].split(' ')[0],
+						version: null,
+						fileName: serviceClass[key].split(' ')[1],
+						functionName: key,
+						SDKFunctionName: serviceClass[key].split(' ')[2],
+						params: [],
+						returnType: null,
+						returnTypeName: null,
+						client: null,
+					});
+				}
+			});
+			if (methods[0].version) {
+				generateClientBasedCode(methods, serviceName);
+			} else {
+				generateClassBasedCode(methods, data, serviceName);
+			}
+			return [2 /*return*/];
+		});
+	});
 }
 exports.generateGCPClass = generateGCPClass;
diff --git a/generator/generators/googleCloud/generator.ts b/generator/generators/googleCloud/generator.ts
index 9a2702cf..c3996431 100644
--- a/generator/generators/googleCloud/generator.ts
+++ b/generator/generators/googleCloud/generator.ts
@@ -1,388 +1,405 @@
-import * as fs from "fs";
-import * as path from "path";
-import { createSourceFile, ScriptTarget,SyntaxKind } from "typescript";
+import * as fs from 'fs';
+import * as path from 'path';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
 
-import { getAST } from "../../parsers/googleCloud/parser";
-import { classBasedTransform } from "../../transformers/googleCloud/classBasedTransformer";
-import { clientBasedTransform } from "../../transformers/googleCloud/clientBasedTransformer";
-import { filters, getDir,groupers, printFile } from "../lib/helper";
+import { getAST } from '../../parsers/googleCloud/parser';
+import { classBasedTransform } from '../../transformers/googleCloud/classBasedTransformer';
+import { clientBasedTransform } from '../../transformers/googleCloud/clientBasedTransformer';
+import { filters, getDir, groupers, printFile } from '../lib/helper';
 
 interface ClassData {
-  name: string;
-  methods: FunctionData[];
-  constructor: constructorData;
-  properties: propertyData[];
+	name: string;
+	methods: FunctionData[];
+	constructor: constructorData;
+	properties: propertyData[];
 }
 
 interface FunctionData {
-  pkgName: string;
-  version: string;
-  fileName: string;
-  functionName: string;
-  SDKFunctionName: string;
-  params: param[];
-  returnType: string;
-  returnTypeName: string;
-  client: string;
+	pkgName: string;
+	version: string;
+	fileName: string;
+	functionName: string;
+	SDKFunctionName: string;
+	params: param[];
+	returnType: string;
+	returnTypeName: string;
+	client: string;
 }
 
 interface propertyData {
-  name: string;
-  type: string;
+	name: string;
+	type: string;
 }
 
 interface constructorData {
-  parameters: param[];
+	parameters: param[];
 }
 
 interface param {
-  name: string;
-  type: string;
-  optional: boolean;
+	name: string;
+	type: string;
+	optional: boolean;
 }
 
-const dummyFile = process.cwd() + "/dummyClasses/gcp.js";
+const dummyFile = process.cwd() + '/dummyClasses/gcp.js';
 const dummyAst = createSourceFile(
-  dummyFile,
-  fs.readFileSync(dummyFile).toString(),
-  ScriptTarget.Latest,
-  true
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	ScriptTarget.Latest,
+	true
 );
 
 export function extractClassBasedSDKData(methods, sdkFiles): any {
-  const specifiedMethods = JSON.parse(JSON.stringify(methods));
-  return new Promise(async (resolve, reject) => {
-    try {
-      let classes: ClassData[] = [];
-
-      sdkFiles.map(file => {
-        file.classes.map(classAst => {
-          const classInfo: ClassData = {
-            name: classAst.name.text,
-            methods: [],
-            properties: [],
-            constructor: null
-          };
-
-          classAst.members.map(member => {
-            if (SyntaxKind[member.kind] === "MethodDeclaration") {
-              const returnType = SyntaxKind[member.type.kind];
-
-              const parameters = member.parameters.map(param => {
-                return {
-                  name: param.name.text,
-                  optional: param.questionToken ? true : false,
-                  type: SyntaxKind[param.type.kind]
-                };
-              });
-              const method: FunctionData = {
-                pkgName: file.pkgName,
-                version: null,
-                fileName: file.fileName,
-                functionName: null,
-                SDKFunctionName: member.name.text,
-                params: parameters,
-                returnType: returnType,
-                returnTypeName: null,
-                client: classAst.name.text // Class name
-              };
-
-              if (returnType === "TypeReference") {
-                method.returnTypeName = member.type.typeName.text;
-              }
-
-              const meth = methods.find(
-                meth =>
-                  meth.SDKFunctionName === method.SDKFunctionName &&
-                  meth.fileName === method.fileName
-              );
-              method.functionName = meth ? meth.functionName : null;
-              classInfo.methods.push(method);
-            }
-
-            if (SyntaxKind[member.kind] === "Constructor") {
-              const parameters = member.parameters.map(param => {
-                return {
-                  name: param.name.text,
-                  optional: param.questionToken ? true : false,
-                  type: SyntaxKind[param.type.kind],
-                  typeRefName: param.type.typeName
-                    ? param.type.typeName.text
-                    : null
-                };
-              });
-
-              classInfo.constructor = {
-                parameters
-              };
-            }
-
-            if (SyntaxKind[member.kind] === "PropertyDeclaration") {
-              const isPrivateProp =
-                member.modifiers &&
-                member.modifiers.some(
-                  modifier => SyntaxKind[modifier.kind] === "PrivateKeyword"
-                );
-              if (!isPrivateProp) {
-                const prop = {
-                  name: member.name.text,
-                  type: SyntaxKind[member.type.kind],
-                  typeRefName: member.type.typeName
-                    ? member.type.typeName.text
-                    : null
-                };
-                classInfo.properties.push(prop);
-              }
-            }
-          });
-          classes.push(classInfo);
-        });
-      });
-
-      methods = [];
-
-      classes.map(classData => {
-        let filteredMethods: any = classData.methods.filter(
-          meth => meth.functionName !== null
-        );
-        filteredMethods.map(filMeth => {
-          filMeth.classConstructorData = classData.constructor;
-        });
-
-        methods = methods.concat(filteredMethods);
-      });
-
-      const extractedData = {
-        classes,
-        methods
-      };
-      if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-        reject(new Error("Data extraction unsuccessful"));
-      } else {
-        resolve(extractedData);
-      }
-    } catch (error) {
-      reject(error);
-    }
-  });
+	const specifiedMethods = JSON.parse(JSON.stringify(methods));
+	return new Promise(async (resolve, reject) => {
+		try {
+			const classes: ClassData[] = [];
+
+			sdkFiles.map(file => {
+				file.classes.map(classAst => {
+					const classInfo: ClassData = {
+						name: classAst.name.text,
+						methods: [],
+						properties: [],
+						constructor: null,
+					};
+
+					classAst.members.map(member => {
+						if (SyntaxKind[member.kind] === 'MethodDeclaration') {
+							const returnType = SyntaxKind[member.type.kind];
+
+							const parameters = member.parameters.map(param => {
+								return {
+									name: param.name.text,
+									optional: param.questionToken
+										? true
+										: false,
+									type: SyntaxKind[param.type.kind],
+								};
+							});
+							const method: FunctionData = {
+								pkgName: file.pkgName,
+								version: null,
+								fileName: file.fileName,
+								functionName: null,
+								SDKFunctionName: member.name.text,
+								params: parameters,
+								returnType: returnType,
+								returnTypeName: null,
+								client: classAst.name.text, // Class name
+							};
+
+							if (returnType === 'TypeReference') {
+								method.returnTypeName =
+									member.type.typeName.text;
+							}
+
+							const meth = methods.find(
+								meth =>
+									meth.SDKFunctionName ===
+										method.SDKFunctionName &&
+									meth.fileName === method.fileName
+							);
+							method.functionName = meth
+								? meth.functionName
+								: null;
+							classInfo.methods.push(method);
+						}
+
+						if (SyntaxKind[member.kind] === 'Constructor') {
+							const parameters = member.parameters.map(param => {
+								return {
+									name: param.name.text,
+									optional: param.questionToken
+										? true
+										: false,
+									type: SyntaxKind[param.type.kind],
+									typeRefName: param.type.typeName
+										? param.type.typeName.text
+										: null,
+								};
+							});
+
+							classInfo.constructor = {
+								parameters,
+							};
+						}
+
+						if (SyntaxKind[member.kind] === 'PropertyDeclaration') {
+							const isPrivateProp =
+								member.modifiers &&
+								member.modifiers.some(
+									modifier =>
+										SyntaxKind[modifier.kind] ===
+										'PrivateKeyword'
+								);
+							if (!isPrivateProp) {
+								const prop = {
+									name: member.name.text,
+									type: SyntaxKind[member.type.kind],
+									typeRefName: member.type.typeName
+										? member.type.typeName.text
+										: null,
+								};
+								classInfo.properties.push(prop);
+							}
+						}
+					});
+					classes.push(classInfo);
+				});
+			});
+
+			methods = [];
+
+			classes.map(classData => {
+				const filteredMethods: any = classData.methods.filter(
+					meth => meth.functionName !== null
+				);
+				filteredMethods.map(filMeth => {
+					filMeth.classConstructorData = classData.constructor;
+				});
+
+				methods = methods.concat(filteredMethods);
+			});
+
+			const extractedData = {
+				classes,
+				methods,
+			};
+			if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
+				reject(new Error('Data extraction unsuccessful'));
+			} else {
+				resolve(extractedData);
+			}
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 export function extractClientBasedSDKdata(methods, sdkFiles): any {
-  const specifiedMethods = JSON.parse(JSON.stringify(methods));
-  return new Promise(async (resolve, reject) => {
-    try {
-      sdkFiles.map(sdkFile => {
-        sdkFile.client = sdkFile.ast.name.text;
-        sdkFile.ast.members.map(member => {
-          if (
-            SyntaxKind[member.kind] === "MethodDeclaration" &&
-            sdkFile.sdkFunctionNames.includes(member.name.text)
-          ) {
-            const method = methods.find(
-              methd => methd.SDKFunctionName === member.name.text
-            );
-
-            const parameters = member.parameters.map(param => {
-              return {
-                name: param.name.text,
-                optional: param.questionToken ? true : false,
-                type: SyntaxKind[param.type.kind]
-              };
-            });
-
-            const returnType = SyntaxKind[member.type.kind];
-            if (returnType === "TypeReference") {
-              method.returnTypeName = member.type.typeName.text;
-            }
-
-            if (!method.returnType) {
-              method.params = parameters;
-              method.returnType = returnType;
-              method.client = sdkFile.client;
-            } else {
-              const clone = JSON.parse(JSON.stringify(method));
-              clone.params = parameters;
-              clone.returnType = returnType;
-              clone.client = sdkFile.client;
-              methods.push(clone);
-            }
-          }
-        });
-      });
-
-      if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
-        reject(new Error("Data extraction unsuccessful"));
-      } else {
-        resolve(methods);
-      }
-    } catch (error) {
-      reject(error);
-    }
-  });
+	const specifiedMethods = JSON.parse(JSON.stringify(methods));
+	return new Promise(async (resolve, reject) => {
+		try {
+			sdkFiles.map(sdkFile => {
+				sdkFile.client = sdkFile.ast.name.text;
+				sdkFile.ast.members.map(member => {
+					if (
+						SyntaxKind[member.kind] === 'MethodDeclaration' &&
+						sdkFile.sdkFunctionNames.includes(member.name.text)
+					) {
+						const method = methods.find(
+							methd => methd.SDKFunctionName === member.name.text
+						);
+
+						const parameters = member.parameters.map(param => {
+							return {
+								name: param.name.text,
+								optional: param.questionToken ? true : false,
+								type: SyntaxKind[param.type.kind],
+							};
+						});
+
+						const returnType = SyntaxKind[member.type.kind];
+						if (returnType === 'TypeReference') {
+							method.returnTypeName = member.type.typeName.text;
+						}
+
+						if (!method.returnType) {
+							method.params = parameters;
+							method.returnType = returnType;
+							method.client = sdkFile.client;
+						} else {
+							const clone = JSON.parse(JSON.stringify(method));
+							clone.params = parameters;
+							clone.returnType = returnType;
+							clone.client = sdkFile.client;
+							methods.push(clone);
+						}
+					}
+				});
+			});
+
+			if (JSON.stringify(methods) === JSON.stringify(specifiedMethods)) {
+				reject(new Error('Data extraction unsuccessful'));
+			} else {
+				resolve(methods);
+			}
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 async function generateClassBasedCode(methods, data, serviceName) {
-  const dirPath = `../../../node_modules/@google-cloud/${methods[0].pkgName}/build/src/`;
-  let files = fs.readdirSync(path.join(__dirname, dirPath));
-  files = files.filter(
-    fileName =>
-      fileName.split(".")[1] === "d" && fileName.split(".")[2] === "ts"
-  );
-
-  const sdkFiles = files.map(fileName => {
-    return {
-      fileName: fileName,
-      pkgName: methods[0].pkgName,
-      classes: null,
-      sdkFunctionNames: methods
-        .filter(method => method.fileName === <string>fileName)
-        .map(method => method.SDKFunctionName)
-    };
-  });
-
-  await Promise.all(
-    sdkFiles.map(async file => {
-      file.classes = await getAST(file, true);
-    })
-  );
-
-  const extractedData = await extractClassBasedSDKData(methods, sdkFiles).then(
-    result => result
-  );
-  const groupedMethods = groupers.gcp(extractedData.methods);
-  methods = filters.gcp(groupedMethods);
-  data.functions = methods;
-  data.classData = extractedData.classes;
-  data.serviceName = serviceName;
-
-  const output = await classBasedTransform(dummyAst, data);
-  let filePath;
-  const dir = getDir(serviceName);
-  if (!fs.existsSync(process.cwd() + "/generatedClasses/googleCloud/" + dir)) {
-    fs.mkdirSync(process.cwd() + "/generatedClasses/googleCloud/" + dir);
-  }
-  if (/^[A-Z]*$/.test(serviceName)) {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/googleCloud/" +
-      dir +
-      "/gcp-" +
-      serviceName +
-      ".js";
-  } else {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/googleCloud/" +
-      dir +
-      "/gcp-" +
-      serviceName.charAt(0).toLowerCase() +
-      serviceName.slice(1) +
-      ".js";
-  }
-  printFile(filePath, output);
+	const dirPath = `../../../node_modules/@google-cloud/${methods[0].pkgName}/build/src/`;
+	let files = fs.readdirSync(path.join(__dirname, dirPath));
+	files = files.filter(
+		fileName =>
+			fileName.split('.')[1] === 'd' && fileName.split('.')[2] === 'ts'
+	);
+
+	const sdkFiles = files.map(fileName => {
+		return {
+			fileName: fileName,
+			pkgName: methods[0].pkgName,
+			classes: null,
+			sdkFunctionNames: methods
+				.filter(method => method.fileName === <string>fileName)
+				.map(method => method.SDKFunctionName),
+		};
+	});
+
+	await Promise.all(
+		sdkFiles.map(async file => {
+			file.classes = await getAST(file, true);
+		})
+	);
+
+	const extractedData = await extractClassBasedSDKData(
+		methods,
+		sdkFiles
+	).then(result => result);
+	const groupedMethods = groupers.gcp(extractedData.methods);
+	methods = filters.gcp(groupedMethods);
+	data.functions = methods;
+	data.classData = extractedData.classes;
+	data.serviceName = serviceName;
+
+	const output = await classBasedTransform(dummyAst, data);
+	let filePath;
+	const dir = getDir(serviceName);
+	if (
+		!fs.existsSync(process.cwd() + '/generatedClasses/googleCloud/' + dir)
+	) {
+		fs.mkdirSync(process.cwd() + '/generatedClasses/googleCloud/' + dir);
+	}
+	if (/^[A-Z]*$/.test(serviceName)) {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/googleCloud/' +
+			dir +
+			'/gcp-' +
+			serviceName +
+			'.js';
+	} else {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/googleCloud/' +
+			dir +
+			'/gcp-' +
+			serviceName.charAt(0).toLowerCase() +
+			serviceName.slice(1) +
+			'.js';
+	}
+	printFile(filePath, output);
 }
 
 async function generateClientBasedCode(methods, serviceName) {
-  const files = Array.from(
-    new Set(methods.map(method => method.fileName + " " + method.version))
-  );
-  const sdkFiles = files.map(file => {
-    return {
-      fileName: (<string>file).split(" ")[0],
-      version: (<string>file).split(" ")[1],
-      pkgName: methods[0].pkgName,
-      ast: null,
-      client: null,
-      sdkFunctionNames: methods
-        .filter(method => method.fileName === (<string>file).split(" ")[0])
-        .map(method => method.SDKFunctionName)
-    };
-  });
-
-  await Promise.all(
-    sdkFiles.map(async file => {
-      file.ast = await getAST(file);
-    })
-  );
-
-  methods = await extractClientBasedSDKdata(methods, sdkFiles).then(
-    result => result
-  );
-  const groupedMethods = groupers.gcp(methods);
-  methods = filters.gcp(groupedMethods);
-
-  const classData = {
-    functions: methods,
-    serviceName
-  };
-
-  const output = await clientBasedTransform(dummyAst, classData);
-  let filePath;
-  const dir = getDir(serviceName);
-  if (!fs.existsSync(process.cwd() + "/generatedClasses/googleCloud/" + dir)) {
-    fs.mkdirSync(process.cwd() + "/generatedClasses/googleCloud/" + dir);
-  }
-  if (/^[A-Z]*$/.test(serviceName)) {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/googleCloud/" +
-      dir +
-      "/gcp-" +
-      serviceName +
-      ".js";
-  } else {
-    filePath =
-      process.cwd() +
-      "/generatedClasses/googleCloud/" +
-      dir +
-      "/gcp-" +
-      serviceName.charAt(0).toLowerCase() +
-      serviceName.slice(1) +
-      ".js";
-  }
-  printFile(filePath, output);
+	const files = Array.from(
+		new Set(methods.map(method => method.fileName + ' ' + method.version))
+	);
+	const sdkFiles = files.map(file => {
+		return {
+			fileName: (<string>file).split(' ')[0],
+			version: (<string>file).split(' ')[1],
+			pkgName: methods[0].pkgName,
+			ast: null,
+			client: null,
+			sdkFunctionNames: methods
+				.filter(
+					method => method.fileName === (<string>file).split(' ')[0]
+				)
+				.map(method => method.SDKFunctionName),
+		};
+	});
+
+	await Promise.all(
+		sdkFiles.map(async file => {
+			file.ast = await getAST(file);
+		})
+	);
+
+	methods = await extractClientBasedSDKdata(methods, sdkFiles).then(
+		result => result
+	);
+	const groupedMethods = groupers.gcp(methods);
+	methods = filters.gcp(groupedMethods);
+
+	const classData = {
+		functions: methods,
+		serviceName,
+	};
+
+	const output = await clientBasedTransform(dummyAst, classData);
+	let filePath;
+	const dir = getDir(serviceName);
+	if (
+		!fs.existsSync(process.cwd() + '/generatedClasses/googleCloud/' + dir)
+	) {
+		fs.mkdirSync(process.cwd() + '/generatedClasses/googleCloud/' + dir);
+	}
+	if (/^[A-Z]*$/.test(serviceName)) {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/googleCloud/' +
+			dir +
+			'/gcp-' +
+			serviceName +
+			'.js';
+	} else {
+		filePath =
+			process.cwd() +
+			'/generatedClasses/googleCloud/' +
+			dir +
+			'/gcp-' +
+			serviceName.charAt(0).toLowerCase() +
+			serviceName.slice(1) +
+			'.js';
+	}
+	printFile(filePath, output);
 }
 
 export async function generateGCPClass(serviceClass, serviceName) {
-  let methods: FunctionData[] = [];
-  const data: any = {};
-
-  Object.keys(serviceClass).map((key, index) => {
-    if (key === "mainClass") {
-      data.mainClass = serviceClass[key];
-    } else if (
-      serviceClass[key].split(" ")[1].length === 2 &&
-      serviceClass[key].split(" ")[1].charAt(0) === "v"
-    ) {
-      methods.push({
-        pkgName: serviceClass[key].split(" ")[0],
-        version: serviceClass[key].split(" ")[1],
-        fileName: serviceClass[key].split(" ")[2],
-        functionName: key,
-        SDKFunctionName: serviceClass[key].split(" ")[3],
-        params: [],
-        returnType: null,
-        returnTypeName: null,
-        client: null
-      });
-    } else {
-      methods.push({
-        pkgName: serviceClass[key].split(" ")[0],
-        version: null,
-        fileName: serviceClass[key].split(" ")[1],
-        functionName: key,
-        SDKFunctionName: serviceClass[key].split(" ")[2],
-        params: [],
-        returnType: null,
-        returnTypeName: null,
-        client: null
-      });
-    }
-  });
-
-  if (methods[0].version) {
-    generateClientBasedCode(methods, serviceName);
-  } else {
-    generateClassBasedCode(methods, data, serviceName);
-  }
+	const methods: FunctionData[] = [];
+	const data: any = {};
+
+	Object.keys(serviceClass).map((key, index) => {
+		if (key === 'mainClass') {
+			data.mainClass = serviceClass[key];
+		} else if (
+			serviceClass[key].split(' ')[1].length === 2 &&
+			serviceClass[key].split(' ')[1].charAt(0) === 'v'
+		) {
+			methods.push({
+				pkgName: serviceClass[key].split(' ')[0],
+				version: serviceClass[key].split(' ')[1],
+				fileName: serviceClass[key].split(' ')[2],
+				functionName: key,
+				SDKFunctionName: serviceClass[key].split(' ')[3],
+				params: [],
+				returnType: null,
+				returnTypeName: null,
+				client: null,
+			});
+		} else {
+			methods.push({
+				pkgName: serviceClass[key].split(' ')[0],
+				version: null,
+				fileName: serviceClass[key].split(' ')[1],
+				functionName: key,
+				SDKFunctionName: serviceClass[key].split(' ')[2],
+				params: [],
+				returnType: null,
+				returnTypeName: null,
+				client: null,
+			});
+		}
+	});
+
+	if (methods[0].version) {
+		generateClientBasedCode(methods, serviceName);
+	} else {
+		generateClassBasedCode(methods, data, serviceName);
+	}
 }
diff --git a/generator/generators/lib/aws/awsHelper.js b/generator/generators/lib/aws/awsHelper.js
index e3a2f3fa..b43d982f 100644
--- a/generator/generators/lib/aws/awsHelper.js
+++ b/generator/generators/lib/aws/awsHelper.js
@@ -1,38 +1,38 @@
-"use strict";
+'use strict';
 exports.__esModule = true;
 exports.filterAWSMethods = exports.groupAWSMethods = void 0;
 function groupAWSMethods(methods) {
-  var methodArr = Object.values(
-    methods.reduce(function(result, _a) {
-      var functionName = _a.functionName,
-        SDKFunctionName = _a.SDKFunctionName,
-        params = _a.params;
-      // Create new group
-      if (!result[functionName])
-        result[functionName] = {
-          functionName: functionName,
-          array: []
-        };
-      // Append to group
-      result[functionName].array.push({
-        functionName: functionName,
-        SDKFunctionName: SDKFunctionName,
-        params: params
-      });
-      return result;
-    }, {})
-  );
-  return methodArr;
+	var methodArr = Object.values(
+		methods.reduce(function(result, _a) {
+			var functionName = _a.functionName,
+				SDKFunctionName = _a.SDKFunctionName,
+				params = _a.params;
+			// Create new group
+			if (!result[functionName])
+				result[functionName] = {
+					functionName: functionName,
+					array: [],
+				};
+			// Append to group
+			result[functionName].array.push({
+				functionName: functionName,
+				SDKFunctionName: SDKFunctionName,
+				params: params,
+			});
+			return result;
+		}, {})
+	);
+	return methodArr;
 }
 exports.groupAWSMethods = groupAWSMethods;
 function filterAWSMethods(groupedMethods) {
-  var methods = [];
-  groupedMethods.map(function(group) {
-    group.array.sort(function(a, b) {
-      return a.params.length - b.params.length;
-    });
-    methods.push(group.array.slice(-1)[0]);
-  });
-  return methods;
+	var methods = [];
+	groupedMethods.map(function(group) {
+		group.array.sort(function(a, b) {
+			return a.params.length - b.params.length;
+		});
+		methods.push(group.array.slice(-1)[0]);
+	});
+	return methods;
 }
 exports.filterAWSMethods = filterAWSMethods;
diff --git a/generator/generators/lib/aws/awsHelper.ts b/generator/generators/lib/aws/awsHelper.ts
index 7cfe04de..13ddcd09 100644
--- a/generator/generators/lib/aws/awsHelper.ts
+++ b/generator/generators/lib/aws/awsHelper.ts
@@ -1,32 +1,32 @@
 export function groupAWSMethods(methods): any {
-  const methodArr = Object.values(
-    methods.reduce((result, { functionName, SDKFunctionName, params }) => {
-      // Create new group
-      if (!result[functionName])
-        result[functionName] = {
-          functionName,
-          array: []
-        };
-      // Append to group
-      result[functionName].array.push({
-        functionName,
-        SDKFunctionName,
-        params
-      });
-      return result;
-    }, {})
-  );
+	const methodArr = Object.values(
+		methods.reduce((result, { functionName, SDKFunctionName, params }) => {
+			// Create new group
+			if (!result[functionName])
+				result[functionName] = {
+					functionName,
+					array: [],
+				};
+			// Append to group
+			result[functionName].array.push({
+				functionName,
+				SDKFunctionName,
+				params,
+			});
+			return result;
+		}, {})
+	);
 
-  return methodArr;
+	return methodArr;
 }
 
 export function filterAWSMethods(groupedMethods): any {
-  let methods = [];
-  groupedMethods.map(group => {
-    group.array.sort(function(a, b) {
-      return a.params.length - b.params.length;
-    });
-    methods.push(group.array.slice(-1)[0]);
-  });
-  return methods;
+	const methods = [];
+	groupedMethods.map(group => {
+		group.array.sort(function(a, b) {
+			return a.params.length - b.params.length;
+		});
+		methods.push(group.array.slice(-1)[0]);
+	});
+	return methods;
 }
diff --git a/generator/generators/lib/azure/azureHelper.js b/generator/generators/lib/azure/azureHelper.js
index 3956a128..38e14b07 100644
--- a/generator/generators/lib/azure/azureHelper.js
+++ b/generator/generators/lib/azure/azureHelper.js
@@ -1,60 +1,60 @@
-"use strict";
+'use strict';
 exports.__esModule = true;
 exports.filterAzureMethods = exports.groupAzureMethods = void 0;
 function groupAzureMethods(methods) {
-  var methodArr = Object.values(
-    methods.reduce(function(result, _a) {
-      var functionName = _a.functionName,
-        SDKFunctionName = _a.SDKFunctionName,
-        params = _a.params,
-        pkgName = _a.pkgName,
-        fileName = _a.fileName,
-        client = _a.client,
-        returnType = _a.returnType;
-      // Create new group
-      if (!result[functionName])
-        result[functionName] = {
-          functionName: functionName,
-          array: []
-        };
-      // Append to group
-      result[functionName].array.push({
-        functionName: functionName,
-        SDKFunctionName: SDKFunctionName,
-        params: params,
-        pkgName: pkgName,
-        fileName: fileName,
-        client: client,
-        returnType: returnType
-      });
-      return result;
-    }, {})
-  );
-  return methodArr;
+	var methodArr = Object.values(
+		methods.reduce(function(result, _a) {
+			var functionName = _a.functionName,
+				SDKFunctionName = _a.SDKFunctionName,
+				params = _a.params,
+				pkgName = _a.pkgName,
+				fileName = _a.fileName,
+				client = _a.client,
+				returnType = _a.returnType;
+			// Create new group
+			if (!result[functionName])
+				result[functionName] = {
+					functionName: functionName,
+					array: [],
+				};
+			// Append to group
+			result[functionName].array.push({
+				functionName: functionName,
+				SDKFunctionName: SDKFunctionName,
+				params: params,
+				pkgName: pkgName,
+				fileName: fileName,
+				client: client,
+				returnType: returnType,
+			});
+			return result;
+		}, {})
+	);
+	return methodArr;
 }
 exports.groupAzureMethods = groupAzureMethods;
 function filterAzureMethods(groupedMethods) {
-  var methods = [];
-  groupedMethods.map(function(group) {
-    if (group.array.length === 1) {
-      methods.push(group.array[0]);
-    } else {
-      var methodPushed_1 = false;
-      group.array.map(function(method) {
-        if (
-          !method.params.find(function(param) {
-            return param.name === "callback";
-          })
-        ) {
-          methods.push(method);
-          methodPushed_1 = true;
-        }
-      });
-      if (!methodPushed_1) {
-        methods.push(group.array[0]);
-      }
-    }
-  });
-  return methods;
+	var methods = [];
+	groupedMethods.map(function(group) {
+		if (group.array.length === 1) {
+			methods.push(group.array[0]);
+		} else {
+			var methodPushed_1 = false;
+			group.array.map(function(method) {
+				if (
+					!method.params.find(function(param) {
+						return param.name === 'callback';
+					})
+				) {
+					methods.push(method);
+					methodPushed_1 = true;
+				}
+			});
+			if (!methodPushed_1) {
+				methods.push(group.array[0]);
+			}
+		}
+	});
+	return methods;
 }
 exports.filterAzureMethods = filterAzureMethods;
diff --git a/generator/generators/lib/azure/azureHelper.ts b/generator/generators/lib/azure/azureHelper.ts
index dc066724..d9d752db 100644
--- a/generator/generators/lib/azure/azureHelper.ts
+++ b/generator/generators/lib/azure/azureHelper.ts
@@ -1,60 +1,60 @@
 export function groupAzureMethods(methods): any {
-  const methodArr = Object.values(
-    methods.reduce(
-      (
-        result,
-        {
-          functionName,
-          SDKFunctionName,
-          params,
-          pkgName,
-          fileName,
-          client,
-          returnType
-        }
-      ) => {
-        // Create new group
-        if (!result[functionName])
-          result[functionName] = {
-            functionName,
-            array: []
-          };
-        // Append to group
-        result[functionName].array.push({
-          functionName,
-          SDKFunctionName,
-          params,
-          pkgName,
-          fileName,
-          client,
-          returnType
-        });
-        return result;
-      },
-      {}
-    )
-  );
+	const methodArr = Object.values(
+		methods.reduce(
+			(
+				result,
+				{
+					functionName,
+					SDKFunctionName,
+					params,
+					pkgName,
+					fileName,
+					client,
+					returnType,
+				}
+			) => {
+				// Create new group
+				if (!result[functionName])
+					result[functionName] = {
+						functionName,
+						array: [],
+					};
+				// Append to group
+				result[functionName].array.push({
+					functionName,
+					SDKFunctionName,
+					params,
+					pkgName,
+					fileName,
+					client,
+					returnType,
+				});
+				return result;
+			},
+			{}
+		)
+	);
 
-  return methodArr;
+	return methodArr;
 }
 
 export function filterAzureMethods(groupedMethods): any {
-  let methods = [];
-  groupedMethods.map(group => {
-    if (group.array.length === 1) {
-      methods.push(group.array[0]);
-    } else {
-      let methodPushed = false;
-      group.array.map(method => {
-        if (!method.params.find(param => param.name === "callback")) {
-          methods.push(method);
-          methodPushed = true;
-        }
-      });
-      if (!methodPushed) {
-        methods.push(group.array[0]);
-      }
-    }
-  });
-  return methods;
+	const methods = [];
+	groupedMethods.map(group => {
+		if (group.array.length === 1) {
+			methods.push(group.array[0]);
+		} else {
+			let methodPushed = false;
+			group.array.map(method => {
+				if (!method.params.find(param => param.name === 'callback')) {
+					methods.push(method);
+					methodPushed = true;
+				}
+			});
+			if (!methodPushed) {
+				methods.push(group.array[0]);
+			}
+		}
+	});
+	return methods;
 }
diff --git a/generator/generators/lib/googleCloud/gcpHelper.js b/generator/generators/lib/googleCloud/gcpHelper.js
index 90353fc4..3a8caddd 100644
--- a/generator/generators/lib/googleCloud/gcpHelper.js
+++ b/generator/generators/lib/googleCloud/gcpHelper.js
@@ -1,64 +1,64 @@
-"use strict";
+'use strict';
 exports.__esModule = true;
 exports.filterGCPMethods = exports.groupGCPMethods = void 0;
 function groupGCPMethods(methods) {
-  var methodArr = Object.values(
-    methods.reduce(function(result, _a) {
-      var functionName = _a.functionName,
-        SDKFunctionName = _a.SDKFunctionName,
-        params = _a.params,
-        pkgName = _a.pkgName,
-        fileName = _a.fileName,
-        client = _a.client,
-        returnType = _a.returnType,
-        returnTypeName = _a.returnTypeName,
-        classConstructorData = _a.classConstructorData;
-      // Create new group
-      if (!result[functionName])
-        result[functionName] = {
-          functionName: functionName,
-          array: []
-        };
-      // Append to group
-      result[functionName].array.push({
-        functionName: functionName,
-        SDKFunctionName: SDKFunctionName,
-        params: params,
-        pkgName: pkgName,
-        fileName: fileName,
-        client: client,
-        returnType: returnType,
-        returnTypeName: returnTypeName,
-        classConstructorData: classConstructorData
-      });
-      return result;
-    }, {})
-  );
-  return methodArr;
+	var methodArr = Object.values(
+		methods.reduce(function(result, _a) {
+			var functionName = _a.functionName,
+				SDKFunctionName = _a.SDKFunctionName,
+				params = _a.params,
+				pkgName = _a.pkgName,
+				fileName = _a.fileName,
+				client = _a.client,
+				returnType = _a.returnType,
+				returnTypeName = _a.returnTypeName,
+				classConstructorData = _a.classConstructorData;
+			// Create new group
+			if (!result[functionName])
+				result[functionName] = {
+					functionName: functionName,
+					array: [],
+				};
+			// Append to group
+			result[functionName].array.push({
+				functionName: functionName,
+				SDKFunctionName: SDKFunctionName,
+				params: params,
+				pkgName: pkgName,
+				fileName: fileName,
+				client: client,
+				returnType: returnType,
+				returnTypeName: returnTypeName,
+				classConstructorData: classConstructorData,
+			});
+			return result;
+		}, {})
+	);
+	return methodArr;
 }
 exports.groupGCPMethods = groupGCPMethods;
 function filterGCPMethods(groupedMethods) {
-  var methods = [];
-  groupedMethods.map(function(group) {
-    if (group.array.length === 1) {
-      methods.push(group.array[0]);
-    } else {
-      var methodPushed_1 = false;
-      group.array.map(function(method) {
-        if (
-          !method.params.find(function(param) {
-            return param.name === "callback";
-          })
-        ) {
-          methods.push(method);
-          methodPushed_1 = true;
-        }
-      });
-      if (!methodPushed_1) {
-        methods.push(group.array[0]);
-      }
-    }
-  });
-  return methods;
+	var methods = [];
+	groupedMethods.map(function(group) {
+		if (group.array.length === 1) {
+			methods.push(group.array[0]);
+		} else {
+			var methodPushed_1 = false;
+			group.array.map(function(method) {
+				if (
+					!method.params.find(function(param) {
+						return param.name === 'callback';
+					})
+				) {
+					methods.push(method);
+					methodPushed_1 = true;
+				}
+			});
+			if (!methodPushed_1) {
+				methods.push(group.array[0]);
+			}
+		}
+	});
+	return methods;
 }
 exports.filterGCPMethods = filterGCPMethods;
diff --git a/generator/generators/lib/googleCloud/gcpHelper.ts b/generator/generators/lib/googleCloud/gcpHelper.ts
index 2b93f726..ee196b45 100644
--- a/generator/generators/lib/googleCloud/gcpHelper.ts
+++ b/generator/generators/lib/googleCloud/gcpHelper.ts
@@ -1,64 +1,64 @@
 export function groupGCPMethods(methods): any {
-  const methodArr = Object.values(
-    methods.reduce(
-      (
-        result,
-        {
-          functionName,
-          SDKFunctionName,
-          params,
-          pkgName,
-          fileName,
-          client,
-          returnType,
-          returnTypeName,
-          classConstructorData
-        }
-      ) => {
-        // Create new group
-        if (!result[functionName])
-          result[functionName] = {
-            functionName,
-            array: []
-          };
-        // Append to group
-        result[functionName].array.push({
-          functionName,
-          SDKFunctionName,
-          params,
-          pkgName,
-          fileName,
-          client,
-          returnType,
-          returnTypeName,
-          classConstructorData
-        });
-        return result;
-      },
-      {}
-    )
-  );
+	const methodArr = Object.values(
+		methods.reduce(
+			(
+				result,
+				{
+					functionName,
+					SDKFunctionName,
+					params,
+					pkgName,
+					fileName,
+					client,
+					returnType,
+					returnTypeName,
+					classConstructorData,
+				}
+			) => {
+				// Create new group
+				if (!result[functionName])
+					result[functionName] = {
+						functionName,
+						array: [],
+					};
+				// Append to group
+				result[functionName].array.push({
+					functionName,
+					SDKFunctionName,
+					params,
+					pkgName,
+					fileName,
+					client,
+					returnType,
+					returnTypeName,
+					classConstructorData,
+				});
+				return result;
+			},
+			{}
+		)
+	);
 
-  return methodArr;
+	return methodArr;
 }
 
 export function filterGCPMethods(groupedMethods): any {
-  let methods = [];
-  groupedMethods.map(group => {
-    if (group.array.length === 1) {
-      methods.push(group.array[0]);
-    } else {
-      let methodPushed = false;
-      group.array.map(method => {
-        if (!method.params.find(param => param.name === "callback")) {
-          methods.push(method);
-          methodPushed = true;
-        }
-      });
-      if (!methodPushed) {
-        methods.push(group.array[0]);
-      }
-    }
-  });
-  return methods;
+	const methods = [];
+	groupedMethods.map(group => {
+		if (group.array.length === 1) {
+			methods.push(group.array[0]);
+		} else {
+			let methodPushed = false;
+			group.array.map(method => {
+				if (!method.params.find(param => param.name === 'callback')) {
+					methods.push(method);
+					methodPushed = true;
+				}
+			});
+			if (!methodPushed) {
+				methods.push(group.array[0]);
+			}
+		}
+	});
+	return methods;
 }
diff --git a/generator/generators/lib/helper.js b/generator/generators/lib/helper.js
index 5cdd24ce..4fbdb30a 100644
--- a/generator/generators/lib/helper.js
+++ b/generator/generators/lib/helper.js
@@ -1,47 +1,47 @@
-"use strict";
+'use strict';
 exports.__esModule = true;
-exports.getDir = exports.filters = exports.groupers = exports.printFile = void 0;
-var fs = require("fs");
-var awsHelper_1 = require("../lib/aws/awsHelper");
-var gcpHelper_1 = require("../lib/googleCloud/gcpHelper");
-var azureHelper_1 = require("../lib/azure/azureHelper");
-var awsHelper_2 = require("../lib/aws/awsHelper");
-var gcpHelper_2 = require("../lib/googleCloud/gcpHelper");
-var azureHelper_2 = require("../lib/azure/azureHelper");
+exports.groupers = exports.getDir = exports.filters = exports.printFile = void 0;
+var fs = require('fs');
+var awsHelper_1 = require('../lib/aws/awsHelper');
+var awsHelper_2 = require('../lib/aws/awsHelper');
+var azureHelper_1 = require('../lib/azure/azureHelper');
+var azureHelper_2 = require('../lib/azure/azureHelper');
+var gcpHelper_1 = require('../lib/googleCloud/gcpHelper');
+var gcpHelper_2 = require('../lib/googleCloud/gcpHelper');
 var dirMap = {
-  appServices: ["PaaS"],
-  compute: ["ComputeInstance", "Kubernetes", "Container"],
-  database: ["NoSqlIndexed", "RDBMS", "NoSql"],
-  management: ["Monitoring", "KeyManagement", "NotificationService"],
-  network: ["DNS", "LoadBalancer"],
-  security: ["IAM"],
-  storage: ["StorageBucket", "BlockStorage", "ArchivalStorage"],
-  artificialinteligence: ["Translation"]
+	appServices: ['PaaS'],
+	compute: ['ComputeInstance', 'Kubernetes', 'Container'],
+	database: ['NoSqlIndexed', 'RDBMS', 'NoSql'],
+	management: ['Monitoring', 'KeyManagement', 'NotificationService'],
+	network: ['DNS', 'LoadBalancer'],
+	security: ['IAM'],
+	storage: ['StorageBucket', 'BlockStorage', 'ArchivalStorage'],
+	artificialinteligence: ['Translation'],
 };
 function printFile(fileName, data) {
-  fs.writeFile(fileName, data, function(err) {
-    if (err) throw err;
-  });
+	fs.writeFile(fileName, data, function(err) {
+		if (err) throw err;
+	});
 }
 exports.printFile = printFile;
 var groupers = {
-  aws: awsHelper_1.groupAWSMethods,
-  gcp: gcpHelper_1.groupGCPMethods,
-  azure: azureHelper_1.groupAzureMethods
+	aws: awsHelper_1.groupAWSMethods,
+	gcp: gcpHelper_1.groupGCPMethods,
+	azure: azureHelper_1.groupAzureMethods,
 };
 exports.groupers = groupers;
 var filters = {
-  aws: awsHelper_2.filterAWSMethods,
-  gcp: gcpHelper_2.filterGCPMethods,
-  azure: azureHelper_2.filterAzureMethods
+	aws: awsHelper_2.filterAWSMethods,
+	gcp: gcpHelper_2.filterGCPMethods,
+	azure: azureHelper_2.filterAzureMethods,
 };
 exports.filters = filters;
 var getDir = function(service) {
-  for (var dir in dirMap) {
-    if (dirMap[dir].includes(service)) {
-      return dir;
-    }
-  }
-  throw new Error("Not a valid service: " + service);
+	for (var dir in dirMap) {
+		if (dirMap[dir].includes(service)) {
+			return dir;
+		}
+	}
+	throw new Error('Not a valid service: ' + service);
 };
 exports.getDir = getDir;
diff --git a/generator/generators/lib/helper.ts b/generator/generators/lib/helper.ts
index 31c67b7c..883aebc9 100644
--- a/generator/generators/lib/helper.ts
+++ b/generator/generators/lib/helper.ts
@@ -1,48 +1,48 @@
-import * as fs from "fs";
+import * as fs from 'fs';
 
-import { groupAWSMethods } from "../lib/aws/awsHelper";
-import { filterAWSMethods } from "../lib/aws/awsHelper";
-import { groupAzureMethods } from "../lib/azure/azureHelper";
-import { filterAzureMethods } from "../lib/azure/azureHelper";
-import { groupGCPMethods } from "../lib/googleCloud/gcpHelper";
-import { filterGCPMethods } from "../lib/googleCloud/gcpHelper";
+import { groupAWSMethods } from '../lib/aws/awsHelper';
+import { filterAWSMethods } from '../lib/aws/awsHelper';
+import { groupAzureMethods } from '../lib/azure/azureHelper';
+import { filterAzureMethods } from '../lib/azure/azureHelper';
+import { groupGCPMethods } from '../lib/googleCloud/gcpHelper';
+import { filterGCPMethods } from '../lib/googleCloud/gcpHelper';
 
 const dirMap = {
-  appServices: ["PaaS"],
-  compute: ["ComputeInstance", "Kubernetes", "Container"],
-  database: ["NoSqlIndexed", "RDBMS", "NoSql"],
-  management: ["Monitoring", "KeyManagement", "NotificationService"],
-  network: ["DNS", "LoadBalancer"],
-  security: ["IAM"],
-  storage: ["StorageBucket", "BlockStorage", "ArchivalStorage"],
-  artificialinteligence: ["Translation"]
+	appServices: ['PaaS'],
+	compute: ['ComputeInstance', 'Kubernetes', 'Container'],
+	database: ['NoSqlIndexed', 'RDBMS', 'NoSql'],
+	management: ['Monitoring', 'KeyManagement', 'NotificationService'],
+	network: ['DNS', 'LoadBalancer'],
+	security: ['IAM'],
+	storage: ['StorageBucket', 'BlockStorage', 'ArchivalStorage'],
+	artificialinteligence: ['Translation'],
 };
 
 export function printFile(fileName, data) {
-  fs.writeFile(fileName, data, function(err) {
-    if (err) throw err;
-  });
+	fs.writeFile(fileName, data, function(err) {
+		if (err) throw err;
+	});
 }
 
 const groupers = {
-  aws: groupAWSMethods,
-  gcp: groupGCPMethods,
-  azure: groupAzureMethods
+	aws: groupAWSMethods,
+	gcp: groupGCPMethods,
+	azure: groupAzureMethods,
 };
 
 const filters = {
-  aws: filterAWSMethods,
-  gcp: filterGCPMethods,
-  azure: filterAzureMethods
+	aws: filterAWSMethods,
+	gcp: filterGCPMethods,
+	azure: filterAzureMethods,
 };
 
 const getDir = (service: string): string => {
-  for (let dir in dirMap) {
-    if (dirMap[dir].includes(service)) {
-      return dir;
-    }
-  }
-  throw new Error("Not a valid service: " + service);
+	for (const dir in dirMap) {
+		if (dirMap[dir].includes(service)) {
+			return dir;
+		}
+	}
+	throw new Error('Not a valid service: ' + service);
 };
 
-export { filters, getDir,groupers };
+export { filters, getDir, groupers };
diff --git a/generator/generators/oracle/generator.js b/generator/generators/oracle/generator.js
new file mode 100644
index 00000000..a34adcdf
--- /dev/null
+++ b/generator/generators/oracle/generator.js
@@ -0,0 +1,272 @@
+'use strict';
+var __awaiter =
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
+var __generator =
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
+exports.__esModule = true;
+exports.generateOracleClass = exports.extractSDKData = void 0;
+var fs = require('fs');
+var typescript_1 = require('typescript');
+var parser_1 = require('../../parsers/oracle/parser');
+var helper_1 = require('../lib/helper');
+var transformer_1 = require('../../transformers/oracle/transformer');
+var dummyFile = process.cwd() + '/dummyClasses/oracle.js';
+var dummyAst = typescript_1.createSourceFile(
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	typescript_1.ScriptTarget.Latest,
+	true
+);
+function extractSDKData(sdkClassAst, serviceClass) {
+	var methods = [];
+	var functions = [];
+	Object.keys(serviceClass).map(function(key, index) {
+		functions.push(serviceClass[key].split(' ')[1]);
+	});
+	sdkClassAst.members.map(function(method) {
+		if (method.name && functions.includes(method.name.text)) {
+			var name_1;
+			Object.keys(serviceClass).map(function(key, index) {
+				if (serviceClass[key].split(' ')[1] === method.name.text) {
+					name_1 = key;
+				}
+			});
+			var parameters_1 = [];
+			method.parameters.map(function(param) {
+				if (param.name.text !== 'callback') {
+					var parameter = {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: typescript_1.SyntaxKind[param.type.kind],
+						typeName: null,
+					};
+					if (
+						parameter.type === 'TypeReference' &&
+						param.type.typeName
+					) {
+						parameter.typeName = param.type.typeName.right.text;
+					}
+					parameters_1.push(parameter);
+				}
+			});
+			methods.push({
+				functionName: name_1.toString(),
+				SDKFunctionName: method.name.text.toString(),
+				params: parameters_1,
+			});
+		}
+	});
+	var classData = {
+		className: sdkClassAst.name.text,
+		functions: methods,
+		serviceName: null,
+	};
+	console.log(classData);
+	return classData;
+}
+exports.extractSDKData = extractSDKData;
+function generateOracleClass(serviceClass, serviceName) {
+	var _this = this;
+	var sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(' ')[0];
+	console.log(sdkFile);
+	parser_1.getAST(sdkFile).then(function(result) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var sdkClassAst, classData, output, filePath, dir, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						sdkClassAst = result;
+						_a.label = 1;
+					case 1:
+						_a.trys.push([1, 3, , 4]);
+						classData = extractSDKData(sdkClassAst, serviceClass);
+						classData.serviceName = serviceName;
+						return [
+							4 /*yield*/,
+							transformer_1.transform(dummyAst, classData),
+						];
+					case 2:
+						output = _a.sent();
+						filePath = void 0;
+						dir = helper_1.getDir(serviceName);
+						if (
+							!fs.existsSync(
+								process.cwd() +
+									'/generatedClasses/Oracle/' +
+									dir
+							)
+						) {
+							fs.mkdirSync(
+								process.cwd() +
+									'/generatedClasses/Oracle/' +
+									dir
+							);
+						}
+						if (/^[A-Z]*$/.test(serviceName)) {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/Oracle/' +
+								dir +
+								'/oci-' +
+								serviceName +
+								'.js';
+						} else {
+							filePath =
+								process.cwd() +
+								'/generatedClasses/Oracle/' +
+								dir +
+								'/oci-' +
+								serviceName.charAt(0).toLowerCase() +
+								serviceName.slice(1) +
+								'.js';
+						}
+						helper_1.printFile(filePath, output);
+						return [3 /*break*/, 4];
+					case 3:
+						error_1 = _a.sent();
+						console.error(error_1);
+						return [3 /*break*/, 4];
+					case 4:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
+}
+exports.generateOracleClass = generateOracleClass;
diff --git a/generator/generators/oracle/generator.ts b/generator/generators/oracle/generator.ts
new file mode 100644
index 00000000..765a4636
--- /dev/null
+++ b/generator/generators/oracle/generator.ts
@@ -0,0 +1,127 @@
+import * as fs from 'fs';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
+
+import { getAST } from '../../parsers/oracle/parser';
+import { transform } from '../../transformers/oracle/transformer';
+import { getDir, printFile } from '../lib/helper';
+
+interface FunctionData {
+	functionName: string;
+	SDKFunctionName: string;
+	params: param[];
+}
+
+interface param {
+	name: string;
+	type: string;
+	typeName: string;
+}
+interface ClassData {
+	className: string;
+	functions: FunctionData[];
+	serviceName: string;
+}
+
+const dummyFile = process.cwd() + '/dummyClasses/oracle.js';
+
+const dummyAst = createSourceFile(
+	dummyFile,
+	fs.readFileSync(dummyFile).toString(),
+	ScriptTarget.Latest,
+	true
+);
+
+export function extractSDKData(sdkClassAst, serviceClass) {
+	const methods: FunctionData[] = [];
+	const functions = [];
+	Object.keys(serviceClass).map((key, index) => {
+		functions.push(serviceClass[key].split(' ')[1]);
+	});
+	sdkClassAst.members.map(method => {
+		if (method.name && functions.includes(method.name.text)) {
+			let name;
+			Object.keys(serviceClass).map((key, index) => {
+				if (serviceClass[key].split(' ')[1] === method.name.text) {
+					name = key;
+				}
+			});
+			const parameters = [];
+			method.parameters.map(param => {
+				if (param.name.text !== 'callback') {
+					const parameter = {
+						name: param.name.text,
+						optional: param.questionToken ? true : false,
+						type: SyntaxKind[param.type.kind],
+						typeName: null,
+					};
+
+					if (
+						parameter.type === 'TypeReference' &&
+						param.type.typeName
+					) {
+						parameter.typeName = param.type.typeName.right.text;
+					}
+					parameters.push(parameter);
+				}
+			});
+
+			methods.push({
+				functionName: name.toString(),
+				SDKFunctionName: method.name.text.toString(),
+				params: parameters,
+			});
+		}
+	});
+	const classData: ClassData = {
+		className: sdkClassAst.name.text,
+		functions: methods,
+		serviceName: null,
+	};
+	return classData;
+}
+
+export function generateOracleClass(serviceClass, serviceName) {
+	const sdkFile = serviceClass[Object.keys(serviceClass)[0]].split(' ')[0];
+	console.log(sdkFile);
+	getAST(sdkFile).then(async result => {
+		const sdkClassAst = result;
+		try {
+			const classData: ClassData = extractSDKData(
+				sdkClassAst,
+				serviceClass
+			);
+			classData.serviceName = serviceName;
+			const output = await transform(dummyAst, classData);
+			let filePath;
+			const dir = getDir(serviceName);
+			if (
+				!fs.existsSync(
+					process.cwd() + '/generatedClasses/Oracle/' + dir
+				)
+			) {
+				fs.mkdirSync(process.cwd() + '/generatedClasses/Oracle/' + dir);
+			}
+			if (/^[A-Z]*$/.test(serviceName)) {
+				filePath =
+					process.cwd() +
+					'/generatedClasses/Oracle/' +
+					dir +
+					'/oci-' +
+					serviceName +
+					'.js';
+			} else {
+				filePath =
+					process.cwd() +
+					'/generatedClasses/Oracle/' +
+					dir +
+					'/oci-' +
+					serviceName.charAt(0).toLowerCase() +
+					serviceName.slice(1) +
+					'.js';
+			}
+			printFile(filePath, output);
+		} catch (error) {
+			console.error(error);
+		}
+	});
+}
diff --git a/generator/main.js b/generator/main.js
index 4f556141..38799843 100644
--- a/generator/main.js
+++ b/generator/main.js
@@ -1,26 +1,29 @@
-"use strict";
+'use strict';
 exports.__esModule = true;
-var yaml = require("js-yaml");
-var fs = require("fs");
-var generator_1 = require("./generators/aws/generator");
-var generator_2 = require("./generators/azure/generator");
-var generator_3 = require("./generators/googleCloud/generator");
-var generator_4 = require("./generators/do/generator");
+var fs = require('fs');
+var yaml = require('js-yaml');
+var generator_1 = require('./generators/oracle/generator');
 try {
-  var services_1 = yaml.safeLoad(fs.readFileSync("node-cloud.yml", "utf8"));
-  Object.keys(services_1).map(function(service, index) {
-    Object.keys(services_1[service]).map(function(provider, index1) {
-      if (provider === "Azure") {
-        generator_2.generateAzureClass(services_1[service][provider], service);
-      } else if (provider === "AWS") {
-        generator_1.generateAWSClass(services_1[service][provider], service);
-      } else if (provider === "GCP") {
-        generator_3.generateGCPClass(services_1[service][provider], service);
-      } else if (provider == "DO") {
-        generator_4.generateDOClass(services_1[service][provider], service);
-      }
-    });
-  });
+	var services_1 = yaml.safeLoad(fs.readFileSync('node-cloud.yml', 'utf8'));
+	Object.keys(services_1).map(function(service, index) {
+		Object.keys(services_1[service]).map(function(provider, index1) {
+			// if (provider === "Azure") {
+			//   generateAzureClass(services[service][provider], service);
+			// } else if (provider === "AWS") {
+			//   generateAWSClass(services[service][provider], service);
+			// } else if (provider === "GCP") {
+			//   generateGCPClass(services[service][provider], service);
+			// } else if (provider == "DO") {
+			//   generateDOClass(services[service][provider], service);
+			// }
+			if (provider == 'Oracle') {
+				generator_1.generateOracleClass(
+					services_1[service][provider],
+					service
+				);
+			}
+		});
+	});
 } catch (error) {
-  console.error("Error : ", error);
+	console.error('Error : ', error);
 }
diff --git a/generator/main.ts b/generator/main.ts
index 5374718c..7ed0c694 100644
--- a/generator/main.ts
+++ b/generator/main.ts
@@ -1,26 +1,30 @@
-import * as fs from "fs";
-import * as yaml from "js-yaml";
+import * as fs from 'fs';
+import * as yaml from 'js-yaml';
 
-import { generateAWSClass } from "./generators/aws/generator";
-import { generateAzureClass } from "./generators/azure/generator";
-import { generateDOClass } from "./generators/do/generator";
-import { generateGCPClass } from "./generators/googleCloud/generator";
+import { generateAWSClass } from './generators/aws/generator';
+import { generateAzureClass } from './generators/azure/generator';
+import { generateDOClass } from './generators/do/generator';
+import { generateGCPClass } from './generators/googleCloud/generator';
+import { generateOracleClass } from './generators/oracle/generator';
 
 try {
-  const services = yaml.safeLoad(fs.readFileSync("node-cloud.yml", "utf8"));
-  Object.keys(services).map((service, index) => {
-    Object.keys(services[service]).map((provider, index1) => {
-      if (provider === "Azure") {
-        generateAzureClass(services[service][provider], service);
-      } else if (provider === "AWS") {
-        generateAWSClass(services[service][provider], service);
-      } else if (provider === "GCP") {
-        generateGCPClass(services[service][provider], service);
-      } else if (provider == "DO") {
-        generateDOClass(services[service][provider], service);
-      }
-    });
-  });
+	const services = yaml.safeLoad(fs.readFileSync('node-cloud.yml', 'utf8'));
+	Object.keys(services).map((service, index) => {
+		Object.keys(services[service]).map((provider, index1) => {
+			// if (provider === "Azure") {
+			//   generateAzureClass(services[service][provider], service);
+			// } else if (provider === "AWS") {
+			//   generateAWSClass(services[service][provider], service);
+			// } else if (provider === "GCP") {
+			//   generateGCPClass(services[service][provider], service);
+			// } else if (provider == "DO") {
+			//   generateDOClass(services[service][provider], service);
+			// }
+			if (provider == 'Oracle') {
+				generateOracleClass(services[service][provider], service);
+			}
+		});
+	});
 } catch (error) {
-  console.error("Error : ", error);
+	console.error('Error : ', error);
 }
diff --git a/generator/node-cloud.yml b/generator/node-cloud.yml
index 88d97d24..28357a38 100644
--- a/generator/node-cloud.yml
+++ b/generator/node-cloud.yml
@@ -1,365 +1,376 @@
 ComputeInstance:
-  AWS:
-    create: ec2.d.ts runInstances
-    list: ec2.d.ts describeInstances
-    start: ec2.d.ts startInstances
-    stop: ec2.d.ts stopInstances
-    reboot: ec2.d.ts rebootInstances
-    destroy: ec2.d.ts terminateInstances
-    monitor: ec2.d.ts monitorInstances
-    unmonitor: ec2.d.ts unmonitorInstances
-    addTags: ec2.d.ts createTags
-  Azure:
-    create: arm-compute virtualMachines.d.ts createOrUpdate
-    list: arm-compute virtualMachines.d.ts list
-    start: arm-compute virtualMachines.d.ts start
-    stop: arm-compute virtualMachines.d.ts powerOff
-    reboot: arm-compute virtualMachines.d.ts restart
-    destroy: arm-compute virtualMachines.d.ts deleteMethod
-  # GCP: This SDK currenlty doesn't contain type definition files
-  DO:
-    create: droplets.d.ts create
-    list: droplets.d.ts getAll
-    destroy: droplets.d.ts deleteById
-    start: droplets.d.ts requestAction
-    stop: droplets.d.ts requestAction
+    AWS:
+        create: ec2.d.ts runInstances
+        list: ec2.d.ts describeInstances
+        start: ec2.d.ts startInstances
+        stop: ec2.d.ts stopInstances
+        reboot: ec2.d.ts rebootInstances
+        destroy: ec2.d.ts terminateInstances
+        monitor: ec2.d.ts monitorInstances
+        unmonitor: ec2.d.ts unmonitorInstances
+        addTags: ec2.d.ts createTags
+    Azure:
+        create: arm-compute virtualMachines.d.ts createOrUpdate
+        list: arm-compute virtualMachines.d.ts list
+        start: arm-compute virtualMachines.d.ts start
+        stop: arm-compute virtualMachines.d.ts powerOff
+        reboot: arm-compute virtualMachines.d.ts restart
+        destroy: arm-compute virtualMachines.d.ts deleteMethod
+    # GCP: This SDK currenlty doesn't contain type definition files
+    DO:
+        create: droplets.d.ts create
+        list: droplets.d.ts getAll
+        destroy: droplets.d.ts deleteById
+        start: droplets.d.ts requestAction
+        stop: droplets.d.ts requestAction
 
 StorageBucket:
-  AWS:
-    create: s3.d.ts createBucket
-    delete: s3.d.ts deleteBucket
-    list: s3.d.ts listBuckets
-    upload: s3.d.ts uploadPart
-    deleteFiles: s3.d.ts deleteObjects
-  Azure:
-    create: arm-storage blobContainers.d.ts create
-    delete: arm-storage blobContainers.d.ts deleteMethod
-    list: arm-storage blobContainers.d.ts list
-  GCP:
-    mainClass: Storage
-    create: storage storage.d.ts createBucket
-    deleteFiles: storage bucket.d.ts deleteFiles
-    delete: storage bucket.d.ts delete
-    list: storage storage.d.ts getBuckets
-    upload: storage bucket.d.ts upload
-    makePublic: storage file.d.ts makePublic
+    AWS:
+        create: s3.d.ts createBucket
+        delete: s3.d.ts deleteBucket
+        list: s3.d.ts listBuckets
+        upload: s3.d.ts uploadPart
+        deleteFiles: s3.d.ts deleteObjects
+    Azure:
+        create: arm-storage blobContainers.d.ts create
+        delete: arm-storage blobContainers.d.ts deleteMethod
+        list: arm-storage blobContainers.d.ts list
+    GCP:
+        mainClass: Storage
+        create: storage storage.d.ts createBucket
+        deleteFiles: storage bucket.d.ts deleteFiles
+        delete: storage bucket.d.ts delete
+        list: storage storage.d.ts getBuckets
+        upload: storage bucket.d.ts upload
+        makePublic: storage file.d.ts makePublic
+    Oracle:
+        create: objectstorage createBucket
+        delete: objectstorage deleteBucket
+        get: objectstorage getBucket
+        list: objectstorage listBuckets
+        reencrypt: objectstorage reencryptBucket
 
 PaaS:
-  AWS:
-    create: elasticbeanstalk.d.ts createApplication
-    update: elasticbeanstalk.d.ts updateApplication
-    describe: elasticbeanstalk.d.ts describeApplications
-    delete: elasticbeanstalk.d.ts deleteApplication
-    restart: elasticbeanstalk.d.ts restartAppServer
-    createEnvironment: elasticbeanstalk.d.ts createEnvironment
-    updateEnvironment: elasticbeanstalk.d.ts updateEnvironment
-    createConfigTemplate: elasticbeanstalk.d.ts createConfigurationTemplate
-    describeConfigSettings: elasticbeanstalk.d.ts describeConfigurationSettings
-    listVersions: elasticbeanstalk.d.ts listPlatformVersions
-    deleteConfigTemplate: elasticbeanstalk.d.ts deleteConfigurationTemplate
-    describeAccountAttributes: elasticbeanstalk.d.ts describeAccountAttributes
-    composeEnvironments: elasticbeanstalk.d.ts composeEnvironments
-    checkDNSAvailability: elasticbeanstalk.d.ts checkDNSAvailability
-    terminateEnvironment: elasticbeanstalk.d.ts terminateEnvironment
-    createStorageLocation: elasticbeanstalk.d.ts createStorageLocation
-  Azure:
-    create: arm-appservice webApps.d.ts createOrUpdate
-    update: arm-appservice webApps.d.ts update
-    describe: arm-appservice webApps.d.ts get
-    delete: arm-appservice webApps.d.ts deleteMethod
-    restart: arm-appservice webApps.d.ts restart
-    createEnvironment: arm-appservice appServiceEnvironments.d.ts createOrUpdate
-    updateEnvironment: arm-appservice appServiceEnvironments.d.ts update
-    createConfigTemplate: arm-appservice webApps.d.ts createOrUpdateSlot
-    describeConfigSettings: arm-appservice webApps.d.ts getSlot
-    deleteConfigTemplate: arm-appservice webApps.d.ts deleteSlot
-    checkDNSAvailability: arm-appservice domains.d.ts checkAvailability
-    terminateEnvironment: arm-appservice appServiceEnvironments.d.ts deleteMethod
+    AWS:
+        create: elasticbeanstalk.d.ts createApplication
+        update: elasticbeanstalk.d.ts updateApplication
+        describe: elasticbeanstalk.d.ts describeApplications
+        delete: elasticbeanstalk.d.ts deleteApplication
+        restart: elasticbeanstalk.d.ts restartAppServer
+        createEnvironment: elasticbeanstalk.d.ts createEnvironment
+        updateEnvironment: elasticbeanstalk.d.ts updateEnvironment
+        createConfigTemplate: elasticbeanstalk.d.ts createConfigurationTemplate
+        describeConfigSettings: elasticbeanstalk.d.ts describeConfigurationSettings
+        listVersions: elasticbeanstalk.d.ts listPlatformVersions
+        deleteConfigTemplate: elasticbeanstalk.d.ts deleteConfigurationTemplate
+        describeAccountAttributes: elasticbeanstalk.d.ts describeAccountAttributes
+        composeEnvironments: elasticbeanstalk.d.ts composeEnvironments
+        checkDNSAvailability: elasticbeanstalk.d.ts checkDNSAvailability
+        terminateEnvironment: elasticbeanstalk.d.ts terminateEnvironment
+        createStorageLocation: elasticbeanstalk.d.ts createStorageLocation
+    Azure:
+        create: arm-appservice webApps.d.ts createOrUpdate
+        update: arm-appservice webApps.d.ts update
+        describe: arm-appservice webApps.d.ts get
+        delete: arm-appservice webApps.d.ts deleteMethod
+        restart: arm-appservice webApps.d.ts restart
+        createEnvironment: arm-appservice appServiceEnvironments.d.ts createOrUpdate
+        updateEnvironment: arm-appservice appServiceEnvironments.d.ts update
+        createConfigTemplate: arm-appservice webApps.d.ts createOrUpdateSlot
+        describeConfigSettings: arm-appservice webApps.d.ts getSlot
+        deleteConfigTemplate: arm-appservice webApps.d.ts deleteSlot
+        checkDNSAvailability: arm-appservice domains.d.ts checkAvailability
+        terminateEnvironment: arm-appservice appServiceEnvironments.d.ts deleteMethod
 
 Kubernetes:
-  Azure:
-    create: arm-containerservice managedClusters.d.ts createOrUpdate
-    delete: arm-containerservice managedClusters.d.ts deleteMethod
-    updateTags: arm-containerservice managedClusters.d.ts updateTags
-    listClusters: arm-containerservice managedClusters.d.ts list
-    describeCluster: arm-containerservice managedClusters.d.ts get
-    createNodeGroup: arm-containerservice agentPools.d.ts createOrUpdate
-    deleteNodegroup: arm-containerservice agentPools.d.ts deleteMethod
-    describeNodeGroup: arm-containerservice agentPools.d.ts get
-    listNodegroups: arm-containerservice agentPools.d.ts list
-    updateConfig: arm-containerservice managedClusters.d.ts rotateClusterCertificates
-  GCP:
-    create: container v1 cluster_manager_client.d.ts createCluster
-    delete: container v1 cluster_manager_client.d.ts deleteCluster
-    listClusters: container v1 cluster_manager_client.d.ts listClusters
-    describeCluster: container v1 cluster_manager_client.d.ts getCluster
-    createNodeGroup: container v1 cluster_manager_client.d.ts createNodePool
-    deleteNodegroup: container v1 cluster_manager_client.d.ts deleteNodePool
-    describeNodeGroup: container v1 cluster_manager_client.d.ts getNodePool
-    listNodegroups: container v1 cluster_manager_client.d.ts listNodePools
-    updateConfig: container v1 cluster_manager_client.d.ts setAddonsConfig
-  AWS:
-    create: eks.d.ts createCluster
-    delete: eks.d.ts deleteCluster
-    listClusters: eks.d.ts listClusters
-    describeCluster: eks.d.ts describeCluster
-    updateTags: eks.d.ts tagResource
-    createNodeGroup: eks.d.ts createNodegroup
-    deleteNodegroup: eks.d.ts deleteNodegroup
-    describeNodeGroup: eks.d.ts describeNodegroup
-    listNodegroups: eks.d.ts listNodegroups
-    updateConfig: eks.d.ts updateClusterConfig
-  DO:
-    create: kubernetes.d.ts create
-    delete: kubernetes.d.ts delete
-    listClusters: kubernetes.d.ts getClusters
-    describeCluster: kubernetes.d.ts getById
-    createNodeGroup: kubernetes.d.ts addNodePool
-    deleteNodegroup: kubernetes.d.ts deleteNodePool
-    describeNodeGroup: kubernetes.d.ts getNodePoolById
-    listNodegroups: kubernetes.d.ts getNodePools
+    Azure:
+        create: arm-containerservice managedClusters.d.ts createOrUpdate
+        delete: arm-containerservice managedClusters.d.ts deleteMethod
+        updateTags: arm-containerservice managedClusters.d.ts updateTags
+        listClusters: arm-containerservice managedClusters.d.ts list
+        describeCluster: arm-containerservice managedClusters.d.ts get
+        createNodeGroup: arm-containerservice agentPools.d.ts createOrUpdate
+        deleteNodegroup: arm-containerservice agentPools.d.ts deleteMethod
+        describeNodeGroup: arm-containerservice agentPools.d.ts get
+        listNodegroups: arm-containerservice agentPools.d.ts list
+        updateConfig: arm-containerservice managedClusters.d.ts rotateClusterCertificates
+    GCP:
+        create: container v1 cluster_manager_client.d.ts createCluster
+        delete: container v1 cluster_manager_client.d.ts deleteCluster
+        listClusters: container v1 cluster_manager_client.d.ts listClusters
+        describeCluster: container v1 cluster_manager_client.d.ts getCluster
+        createNodeGroup: container v1 cluster_manager_client.d.ts createNodePool
+        deleteNodegroup: container v1 cluster_manager_client.d.ts deleteNodePool
+        describeNodeGroup: container v1 cluster_manager_client.d.ts getNodePool
+        listNodegroups: container v1 cluster_manager_client.d.ts listNodePools
+        updateConfig: container v1 cluster_manager_client.d.ts setAddonsConfig
+    AWS:
+        create: eks.d.ts createCluster
+        delete: eks.d.ts deleteCluster
+        listClusters: eks.d.ts listClusters
+        describeCluster: eks.d.ts describeCluster
+        updateTags: eks.d.ts tagResource
+        createNodeGroup: eks.d.ts createNodegroup
+        deleteNodegroup: eks.d.ts deleteNodegroup
+        describeNodeGroup: eks.d.ts describeNodegroup
+        listNodegroups: eks.d.ts listNodegroups
+        updateConfig: eks.d.ts updateClusterConfig
+    DO:
+        create: kubernetes.d.ts create
+        delete: kubernetes.d.ts delete
+        listClusters: kubernetes.d.ts getClusters
+        describeCluster: kubernetes.d.ts getById
+        createNodeGroup: kubernetes.d.ts addNodePool
+        deleteNodegroup: kubernetes.d.ts deleteNodePool
+        describeNodeGroup: kubernetes.d.ts getNodePoolById
+        listNodegroups: kubernetes.d.ts getNodePools
 
 Monitoring:
-  GCP:
-    createAlarm: monitoring v3 alert_policy_service_client.d.ts createAlertPolicy
-    deleteAlarm: monitoring v3 alert_policy_service_client.d.ts deleteAlertPolicy
-    updateAlarm: monitoring v3 alert_policy_service_client.d.ts updateAlertPolicy
-    listAlarms: monitoring v3 alert_policy_service_client.d.ts listAlertPolicies
-    getMetricData: monitoring v3 metric_service_client.d.ts getMetricDescriptor
-    projectPath: monitoring v3 alert_policy_service_client.d.ts projectPath
-  AWS:
-    createAlarm: cloudwatch.d.ts putMetricAlarm
-    deleteAlarm: cloudwatch.d.ts deleteAlarms
-    updateAlarm: cloudwatch.d.ts putMetricAlarm # same method for update
-    listAlarms: cloudwatch.d.ts listMetrics
-    getMetricData: cloudwatch.d.ts getMetricData
-  Azure:
-    createAlarm: arm-monitor alertRules.d.ts createOrUpdate
-    deleteAlarm: arm-monitor alertRules.d.ts deleteMethod
-    updateAlarm: arm-monitor alertRules.d.ts update
-    listAlarms: arm-monitor alertRules.d.ts listBySubscription
-    getMetricData: arm-monitor alertRules.d.ts get
+    GCP:
+        createAlarm: monitoring v3 alert_policy_service_client.d.ts createAlertPolicy
+        deleteAlarm: monitoring v3 alert_policy_service_client.d.ts deleteAlertPolicy
+        updateAlarm: monitoring v3 alert_policy_service_client.d.ts updateAlertPolicy
+        listAlarms: monitoring v3 alert_policy_service_client.d.ts listAlertPolicies
+        getMetricData: monitoring v3 metric_service_client.d.ts getMetricDescriptor
+        projectPath: monitoring v3 alert_policy_service_client.d.ts projectPath
+    AWS:
+        createAlarm: cloudwatch.d.ts putMetricAlarm
+        deleteAlarm: cloudwatch.d.ts deleteAlarms
+        updateAlarm: cloudwatch.d.ts putMetricAlarm # same method for update
+        listAlarms: cloudwatch.d.ts listMetrics
+        getMetricData: cloudwatch.d.ts getMetricData
+    Azure:
+        createAlarm: arm-monitor alertRules.d.ts createOrUpdate
+        deleteAlarm: arm-monitor alertRules.d.ts deleteMethod
+        updateAlarm: arm-monitor alertRules.d.ts update
+        listAlarms: arm-monitor alertRules.d.ts listBySubscription
+        getMetricData: arm-monitor alertRules.d.ts get
 
 Container:
-  AWS:
-    create: ecs.d.ts createCluster
-    delete: ecs.d.ts deleteCluster
-    describe: ecs.d.ts describeClusters
-    list: ecs.d.ts listClusters
-  Azure:
-    create: arm-containerservice containerServices.d.ts createOrUpdate
-    delete: arm-containerservice containerServices.d.ts deleteMethod
-    describe: arm-containerservice containerServices.d.ts get
-    list: arm-containerservice containerServices.d.ts list
+    AWS:
+        create: ecs.d.ts createCluster
+        delete: ecs.d.ts deleteCluster
+        describe: ecs.d.ts describeClusters
+        list: ecs.d.ts listClusters
+    Azure:
+        create: arm-containerservice containerServices.d.ts createOrUpdate
+        delete: arm-containerservice containerServices.d.ts deleteMethod
+        describe: arm-containerservice containerServices.d.ts get
+        list: arm-containerservice containerServices.d.ts list
 
 NoSqlIndexed:
-  AWS:
-    createCollection: SimpleDB.d.ts createDomain
-    deleteCollection: SimpleDB.d.ts deleteDomain
-    listCollections: SimpleDB.d.ts listDomains
-    batchDelete: SimpleDB.d.ts batchDeleteAttributes
-    batchWrite: SimpleDB.d.ts batchPutAttributes
-    query: SimpleDB.d.ts select
-    setAttribute: SimpleDB.d.ts putAttributes
-    deleteAttribute: SimpleDB.d.ts deleteAttributes
-    getAttributes: SimpleDB.d.ts getAttributes
+    AWS:
+        createCollection: SimpleDB.d.ts createDomain
+        deleteCollection: SimpleDB.d.ts deleteDomain
+        listCollections: SimpleDB.d.ts listDomains
+        batchDelete: SimpleDB.d.ts batchDeleteAttributes
+        batchWrite: SimpleDB.d.ts batchPutAttributes
+        query: SimpleDB.d.ts select
+        setAttribute: SimpleDB.d.ts putAttributes
+        deleteAttribute: SimpleDB.d.ts deleteAttributes
+        getAttributes: SimpleDB.d.ts getAttributes
 
 RDBMS:
-  AWS:
-    createDatabse: rds.d.ts createDBCluster
-    deleteDatabase: rds.d.ts deleteDBCluster
-    createSnapshots: rds.d.ts createDBSnapshot
-    modifyDB: rds.d.ts modifyDBCluster
-    restoreDatabase: rds.d.ts rebootDBInstance
-    deleteDBSnapshot: rds.d.ts deleteDBSnapshot
-  Azure:
-    createDatabse: arm-sql databases.d.ts createOrUpdate
-    deleteDatabase: arm-sql databases.d.ts deleteMethod
-    createSnapshots: arm-sql databases.d.ts exportMethod
-    modifyDB: arm-sql databases.d.ts update
-    restoreDatabase: arm-sql managedDatabases.d.ts completeRestore
-  GCP:
-    createDatabse: spanner v1 database_admin_client.d.ts createDatabase
-    deleteDatabase: spanner v1 database_admin_client.d.ts dropDatabase
-    createSnapshots: spanner v1 database_admin_client.d.ts createBackup
-    modifyDB: spanner v1 database_admin_client.d.ts updateDatabaseDdl
-    restoreDatabase: spanner v1 database_admin_client.d.ts restoreDatabase
-    deleteDBSnapshot: spanner v1 database_admin_client.d.ts deleteBackup
-    databasePath: spanner v1 database_admin_client.d.ts databasePath
-  DO:
-    createCluster: databases.d.ts createCluster
-    getClusters: databases.d.ts getAllClusters
-    getCluster: databases.d.ts getClusterById
-    updateCluster: databases.d.ts resizeCluster
+    AWS:
+        createDatabse: rds.d.ts createDBCluster
+        deleteDatabase: rds.d.ts deleteDBCluster
+        createSnapshots: rds.d.ts createDBSnapshot
+        modifyDB: rds.d.ts modifyDBCluster
+        restoreDatabase: rds.d.ts rebootDBInstance
+        deleteDBSnapshot: rds.d.ts deleteDBSnapshot
+    Azure:
+        createDatabse: arm-sql databases.d.ts createOrUpdate
+        deleteDatabase: arm-sql databases.d.ts deleteMethod
+        createSnapshots: arm-sql databases.d.ts exportMethod
+        modifyDB: arm-sql databases.d.ts update
+        restoreDatabase: arm-sql managedDatabases.d.ts completeRestore
+    GCP:
+        createDatabse: spanner v1 database_admin_client.d.ts createDatabase
+        deleteDatabase: spanner v1 database_admin_client.d.ts dropDatabase
+        createSnapshots: spanner v1 database_admin_client.d.ts createBackup
+        modifyDB: spanner v1 database_admin_client.d.ts updateDatabaseDdl
+        restoreDatabase: spanner v1 database_admin_client.d.ts restoreDatabase
+        deleteDBSnapshot: spanner v1 database_admin_client.d.ts deleteBackup
+        databasePath: spanner v1 database_admin_client.d.ts databasePath
+    DO:
+        createCluster: databases.d.ts createCluster
+        getClusters: databases.d.ts getAllClusters
+        getCluster: databases.d.ts getClusterById
+        updateCluster: databases.d.ts resizeCluster
 
 NoSql:
-  AWS:
-    createTable: dynamodb.d.ts createTable
-    createItem: dynamodb.d.ts putItem
-    deleteItem: dynamodb.d.ts deleteItem
-    updateItem: dynamodb.d.ts updateItem
-    query: dynamodb.d.ts query
-    deleteTable: dynamodb.d.ts deleteTable
-  Azure:
-    createCollection: arm-cosmosdb tableResources.d.ts createUpdateTable
-    deleteCollection: arm-cosmosdb tableResources.d.ts deleteTable
-    listCollections: arm-cosmosdb tableResources.d.ts listTables
-    setAttribute: arm-cosmosdb tableResources.d.ts updateTableThroughput
-    getAttributes: arm-cosmosdb tableResources.d.ts getTable
-  GCP:
-    createItem: firestore v1 firestore_client.d.ts createDocument
-    deleteItem: firestore v1 firestore_client.d.ts deleteDocument
-    updateItem: firestore v1 firestore_client.d.ts updateDocument
-    query: firestore v1 firestore_client.d.ts runQuery
-  DO:
-    createCluster: databases.d.ts createCluster
-    getClusters: databases.d.ts getAllClusters
-    getCluster: databases.d.ts getClusterById
-    updateCluster: databases.d.ts resizeCluster
+    AWS:
+        createTable: dynamodb.d.ts createTable
+        createItem: dynamodb.d.ts putItem
+        deleteItem: dynamodb.d.ts deleteItem
+        updateItem: dynamodb.d.ts updateItem
+        query: dynamodb.d.ts query
+        deleteTable: dynamodb.d.ts deleteTable
+    Azure:
+        createCollection: arm-cosmosdb tableResources.d.ts createUpdateTable
+        deleteCollection: arm-cosmosdb tableResources.d.ts deleteTable
+        listCollections: arm-cosmosdb tableResources.d.ts listTables
+        setAttribute: arm-cosmosdb tableResources.d.ts updateTableThroughput
+        getAttributes: arm-cosmosdb tableResources.d.ts getTable
+    GCP:
+        createItem: firestore v1 firestore_client.d.ts createDocument
+        deleteItem: firestore v1 firestore_client.d.ts deleteDocument
+        updateItem: firestore v1 firestore_client.d.ts updateDocument
+        query: firestore v1 firestore_client.d.ts runQuery
+    DO:
+        createCluster: databases.d.ts createCluster
+        getClusters: databases.d.ts getAllClusters
+        getCluster: databases.d.ts getClusterById
+        updateCluster: databases.d.ts resizeCluster
 
 DNS:
-  AWS:
-    createZone: route53.d.ts createHostedZone
-    deleteZone: route53.d.ts deleteHostedZone
-    listZones: route53.d.ts listHostedZones
-    changeRecordSets: route53.d.ts changeResourceRecordSets
-  Azure:
-    createZone: arm-dns zones.d.ts createOrUpdate
-    deleteZone: arm-dns zones.d.ts deleteMethod
-    listZones: arm-dns zones.d.ts list
-    changeRecordSets: arm-dns recordSets.d.ts createOrUpdate
-  GCP:
-    mainClass: DNS
-    createZone: dns zone.d.ts create
-    deleteZone: dns zone.d.ts delete
-    listZones: dns index.d.ts getZones
-    changeRecordSets: dns zone.d.ts createChange
-    record: dns zone.d.ts record
-  DO:
-    createRecord: domains.d.ts createRecord
-    deleteRecord: domains.d.ts deleteRecord
-    getRecords: domains.d.ts getAllRecords
-    getRecord: domains.d.ts getRecord
-    changeRecordSets: domains.d.ts updateRecord
+    AWS:
+        createZone: route53.d.ts createHostedZone
+        deleteZone: route53.d.ts deleteHostedZone
+        listZones: route53.d.ts listHostedZones
+        changeRecordSets: route53.d.ts changeResourceRecordSets
+    Azure:
+        createZone: arm-dns zones.d.ts createOrUpdate
+        deleteZone: arm-dns zones.d.ts deleteMethod
+        listZones: arm-dns zones.d.ts list
+        changeRecordSets: arm-dns recordSets.d.ts createOrUpdate
+    GCP:
+        mainClass: DNS
+        createZone: dns zone.d.ts create
+        deleteZone: dns zone.d.ts delete
+        listZones: dns index.d.ts getZones
+        changeRecordSets: dns zone.d.ts createChange
+        record: dns zone.d.ts record
+    DO:
+        createRecord: domains.d.ts createRecord
+        deleteRecord: domains.d.ts deleteRecord
+        getRecords: domains.d.ts getAllRecords
+        getRecord: domains.d.ts getRecord
+        changeRecordSets: domains.d.ts updateRecord
 
 LoadBalancer:
-  AWS:
-    create: elb.d.ts createLoadBalancer
-    delete: elb.d.ts deleteLoadBalancer
-    list: elb.d.ts describeLoadBalancers
-    addTags: elb.d.ts addTags
-    describe: elb.d.ts describeLoadBalancerAttributes
-  Azure:
-    create: arm-network loadBalancers.d.ts createOrUpdate
-    delete: arm-network loadBalancers.d.ts deleteMethod
-    list: arm-network loadBalancers.d.ts list
-    addTags: arm-network loadBalancers.d.ts updateTags
-    describe: arm-network loadBalancers.d.ts get
-  DO:
-    create: load-balancers.d.ts create
-    delete: load-balancers.d.ts delete
-    list: load-balancers.d.ts getAll
-    update: load-balancers.d.ts update
+    AWS:
+        create: elb.d.ts createLoadBalancer
+        delete: elb.d.ts deleteLoadBalancer
+        list: elb.d.ts describeLoadBalancers
+        addTags: elb.d.ts addTags
+        describe: elb.d.ts describeLoadBalancerAttributes
+    Azure:
+        create: arm-network loadBalancers.d.ts createOrUpdate
+        delete: arm-network loadBalancers.d.ts deleteMethod
+        list: arm-network loadBalancers.d.ts list
+        addTags: arm-network loadBalancers.d.ts updateTags
+        describe: arm-network loadBalancers.d.ts get
+    DO:
+        create: load-balancers.d.ts create
+        delete: load-balancers.d.ts delete
+        list: load-balancers.d.ts getAll
+        update: load-balancers.d.ts update
 
 IAM:
-  AWS:
-    createGroup: iam.d.ts createGroup
-    deleteGroup: iam.d.ts deleteGroup
-    attachGroupPolicy: iam.d.ts attachGroupPolicy
-    detachGroupPolicy: iam.d.ts detachGroupPolicy
-    describe: iam.d.ts getGroup
+    AWS:
+        createGroup: iam.d.ts createGroup
+        deleteGroup: iam.d.ts deleteGroup
+        attachGroupPolicy: iam.d.ts attachGroupPolicy
+        detachGroupPolicy: iam.d.ts detachGroupPolicy
+        describe: iam.d.ts getGroup
 
 ArchivalStorage:
-  AWS:
-    create: glacier.d.ts createVault
-    delete: glacier.d.ts deleteVault
-    list: glacier.d.ts listParts
-    upload: glacier.d.ts initiateMultipartUpload
-    deleteFiles: glacier.d.ts deleteArchive
+    AWS:
+        create: glacier.d.ts createVault
+        delete: glacier.d.ts deleteVault
+        list: glacier.d.ts listParts
+        upload: glacier.d.ts initiateMultipartUpload
+        deleteFiles: glacier.d.ts deleteArchive
 
-  GCP:
-    # Use storage class as coldline
-    mainClass: Storage
-    create: storage storage.d.ts createBucket
-    deleteFiles: storage bucket.d.ts deleteFiles
-    delete: storage bucket.d.ts delete
-    list: storage storage.d.ts getBuckets
-    upload: storage bucket.d.ts upload
-    makePublic: storage file.d.ts makePublic
+    GCP:
+        # Use storage class as coldline
+        mainClass: Storage
+        create: storage storage.d.ts createBucket
+        deleteFiles: storage bucket.d.ts deleteFiles
+        delete: storage bucket.d.ts delete
+        list: storage storage.d.ts getBuckets
+        upload: storage bucket.d.ts upload
+        makePublic: storage file.d.ts makePublic
+    Oracle:
+        create: objectstorage createBucket
+        delete: objectstorage deleteBucket
+        list: objectstorage listBuckets
+        update: objectstorage updateBucket
 
 Translation:
-  AWS:
-    translate: translate.d.ts translateText
-    batchTranslate: translate.d.ts startTextTranslationJob
-    getGlossary: translate.d.ts getTerminology
-    createGlossary: translate.d.ts importTerminology
-    deleteGlossary: translate.d.ts deleteTerminology
-  GCP:
-    translate: translate v3 translation_service_client.d.ts translateText
-    batchTranslate: translate v3 translation_service_client.d.ts batchTranslateText
-    getGlossary: translate v3 translation_service_client.d.ts getGlossary
-    createGlossary: translate v3 translation_service_client.d.ts createGlossary
-    detectLanguage: translate v3 translation_service_client.d.ts detectLanguage
+    AWS:
+        translate: translate.d.ts translateText
+        batchTranslate: translate.d.ts startTextTranslationJob
+        getGlossary: translate.d.ts getTerminology
+        createGlossary: translate.d.ts importTerminology
+        deleteGlossary: translate.d.ts deleteTerminology
+    GCP:
+        translate: translate v3 translation_service_client.d.ts translateText
+        batchTranslate: translate v3 translation_service_client.d.ts batchTranslateText
+        getGlossary: translate v3 translation_service_client.d.ts getGlossary
+        createGlossary: translate v3 translation_service_client.d.ts createGlossary
+        detectLanguage: translate v3 translation_service_client.d.ts detectLanguage
 
 KeyManagement:
-  AWS:
-    createKey: kms.d.ts createKey
-    deleteKey: kms.d.ts deleteCustomKeyStore
-    update: kms.d.ts updateKeyDescription
-    describeKey: kms.d.ts describeKey
-    putKeyPolicy: kms.d.ts putKeyPolicy
-  Azure:
-    createKey: arm-keyvault vaults.d.ts createOrUpdate
-    deleteKey: arm-keyvault vaults.d.ts deleteMethod
-    update: arm-keyvault vaults.d.ts update
-    describeKey: arm-keyvault vaults.d.ts get
-    putKeyPolicy: arm-keyvault vaults.d.ts updateAccessPolicy
-  GCP:
-    createKey: kms v1 key_management_service_client.d.ts createCryptoKey
-    deleteKey: kms v1 key_management_service_client.d.ts destroyCryptoKeyVersion
-    update: kms v1 key_management_service_client.d.ts updateCryptoKey
-    describeKey: kms v1 key_management_service_client.d.ts getCryptoKey
-    putKeyPolicy: kms v1 key_management_service_client.d.ts setIamPolicy
-  DO:
-    createKey: keys.d.ts add
-    deleteKey: keys.d.ts delete
-    list: keys.d.ts getAll
-    describeKey: keys.d.ts getById
+    AWS:
+        createKey: kms.d.ts createKey
+        deleteKey: kms.d.ts deleteCustomKeyStore
+        update: kms.d.ts updateKeyDescription
+        describeKey: kms.d.ts describeKey
+        putKeyPolicy: kms.d.ts putKeyPolicy
+    Azure:
+        createKey: arm-keyvault vaults.d.ts createOrUpdate
+        deleteKey: arm-keyvault vaults.d.ts deleteMethod
+        update: arm-keyvault vaults.d.ts update
+        describeKey: arm-keyvault vaults.d.ts get
+        putKeyPolicy: arm-keyvault vaults.d.ts updateAccessPolicy
+    GCP:
+        createKey: kms v1 key_management_service_client.d.ts createCryptoKey
+        deleteKey: kms v1 key_management_service_client.d.ts destroyCryptoKeyVersion
+        update: kms v1 key_management_service_client.d.ts updateCryptoKey
+        describeKey: kms v1 key_management_service_client.d.ts getCryptoKey
+        putKeyPolicy: kms v1 key_management_service_client.d.ts setIamPolicy
+    DO:
+        createKey: keys.d.ts add
+        deleteKey: keys.d.ts delete
+        list: keys.d.ts getAll
+        describeKey: keys.d.ts getById
 
 NotificationService:
-  AWS:
-    createTopic: sns.d.ts createTopic
-    deleteTopic: sns.d.ts deleteTopic
-    getTopicAttributes: sns.d.ts getTopicAttributes
-    listSubscriptions: sns.d.ts listSubscriptions
-    publish: sns.d.ts publish
-    subscribe: sns.d.ts subscribe
-    listTopics: sns.d.ts listTopics
-    unsubscribe: sns.d.ts unsubscribe
-  GCP:
-    createTopic: pubsub v1 publisher_client.d.ts createTopic
-    deleteTopic: pubsub v1 publisher_client.d.ts deleteTopic
-    getTopicAttributes: pubsub v1 publisher_client.d.ts getTopic
-    listSubscriptions: pubsub v1 publisher_client.d.ts listTopicSubscriptions
-    subscribe: pubsub v1 subscriber_client.d.ts createSubscription
-    publish: pubsub v1 publisher_client.d.ts publish
-    listTopics: pubsub v1 publisher_client.d.ts listTopics
-    unsubscribe: pubsub v1 subscriber_client.d.ts deleteSubscription
+    AWS:
+        createTopic: sns.d.ts createTopic
+        deleteTopic: sns.d.ts deleteTopic
+        getTopicAttributes: sns.d.ts getTopicAttributes
+        listSubscriptions: sns.d.ts listSubscriptions
+        publish: sns.d.ts publish
+        subscribe: sns.d.ts subscribe
+        listTopics: sns.d.ts listTopics
+        unsubscribe: sns.d.ts unsubscribe
+    GCP:
+        createTopic: pubsub v1 publisher_client.d.ts createTopic
+        deleteTopic: pubsub v1 publisher_client.d.ts deleteTopic
+        getTopicAttributes: pubsub v1 publisher_client.d.ts getTopic
+        listSubscriptions: pubsub v1 publisher_client.d.ts listTopicSubscriptions
+        subscribe: pubsub v1 subscriber_client.d.ts createSubscription
+        publish: pubsub v1 publisher_client.d.ts publish
+        listTopics: pubsub v1 publisher_client.d.ts listTopics
+        unsubscribe: pubsub v1 subscriber_client.d.ts deleteSubscription
 
 BlockStorage:
-  AWS:
-    create: ec2.d.ts createVolume
-    delete: ec2.d.ts deleteVolume
-    describe: ec2.d.ts describeVolumeAttribute
-    list: ec2.d.ts describeVolumes
-  Azure:
-    create: arm-compute disks.d.ts createOrUpdate
-    delete: arm-compute disks.d.ts deleteMethod
-    describe: arm-compute disks.d.ts get
-    list: arm-compute disks.d.ts list
-    update: arm-compute disks.d.ts update
-  DO:
-    create: volumes.d.ts create
-    delete: volumes.d.ts deleteById
-    list: volumes.d.ts getAll
-    describe: volumes.d.ts getById
+    AWS:
+        create: ec2.d.ts createVolume
+        delete: ec2.d.ts deleteVolume
+        describe: ec2.d.ts describeVolumeAttribute
+        list: ec2.d.ts describeVolumes
+    Azure:
+        create: arm-compute disks.d.ts createOrUpdate
+        delete: arm-compute disks.d.ts deleteMethod
+        describe: arm-compute disks.d.ts get
+        list: arm-compute disks.d.ts list
+        update: arm-compute disks.d.ts update
+    DO:
+        create: volumes.d.ts create
+        delete: volumes.d.ts deleteById
+        list: volumes.d.ts getAll
+        describe: volumes.d.ts getById
diff --git a/generator/parsers/aws/parser.js b/generator/parsers/aws/parser.js
index 8fd5e392..7e661687 100644
--- a/generator/parsers/aws/parser.js
+++ b/generator/parsers/aws/parser.js
@@ -1,194 +1,202 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.getAST = void 0;
-var fs = require("fs");
-var path = require("path");
-var typescript_1 = require("typescript");
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
 function getAST(sdkFileName) {
-  var _this = this;
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var file, ast, cloned_1, error_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2, , 3]);
-            file = path.join(
-              __dirname,
-              "../../../node_modules/aws-sdk/clients/" +
-                sdkFileName.toLowerCase()
-            );
-            ast = typescript_1.createSourceFile(
-              file,
-              fs.readFileSync(file).toString(),
-              typescript_1.ScriptTarget.Latest,
-              true
-            );
-            cloned_1 = null;
-            return [
-              4 /*yield*/,
-              ast.forEachChild(function(child) {
-                if (
-                  typescript_1.SyntaxKind[child.kind] === "ClassDeclaration"
-                ) {
-                  cloned_1 = Object.assign({}, child);
-                }
-              })
-            ];
-          case 1:
-            _a.sent();
-            if (!cloned_1) {
-              reject(new Error("Class not found!"));
-            } else {
-              resolve(cloned_1);
-            }
-            return [3 /*break*/, 3];
-          case 2:
-            error_1 = _a.sent();
-            if (error_1.code === "ENOENT") {
-              reject(new Error("File not found!"));
-            } else {
-              reject(error_1);
-            }
-            return [3 /*break*/, 3];
-          case 3:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var file, ast, cloned_1, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						_a.trys.push([0, 2, , 3]);
+						file = path.join(
+							__dirname,
+							'../../../node_modules/aws-sdk/clients/' +
+								sdkFileName.toLowerCase()
+						);
+						ast = typescript_1.createSourceFile(
+							file,
+							fs.readFileSync(file).toString(),
+							typescript_1.ScriptTarget.Latest,
+							true
+						);
+						cloned_1 = null;
+						return [
+							4 /*yield*/,
+							ast.forEachChild(function(child) {
+								if (
+									typescript_1.SyntaxKind[child.kind] ===
+									'ClassDeclaration'
+								) {
+									cloned_1 = Object.assign({}, child);
+								}
+							}),
+						];
+					case 1:
+						_a.sent();
+						if (!cloned_1) {
+							reject(new Error('Class not found!'));
+						} else {
+							resolve(cloned_1);
+						}
+						return [3 /*break*/, 3];
+					case 2:
+						error_1 = _a.sent();
+						if (error_1.code === 'ENOENT') {
+							reject(new Error('File not found!'));
+						} else {
+							reject(error_1);
+						}
+						return [3 /*break*/, 3];
+					case 3:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.getAST = getAST;
diff --git a/generator/parsers/azure/parser.js b/generator/parsers/azure/parser.js
index 317dfc5f..d88c5450 100644
--- a/generator/parsers/azure/parser.js
+++ b/generator/parsers/azure/parser.js
@@ -1,196 +1,204 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.getAST = void 0;
-var fs = require("fs");
-var path = require("path");
-var typescript_1 = require("typescript");
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
 function getAST(sdkFileInfo) {
-  var _this = this;
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var file, ast, cloned_1, error_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2, , 3]);
-            file = path.join(
-              __dirname,
-              "../../../node_modules/@azure/" +
-                sdkFileInfo.pkgName +
-                "/esm/operations/" +
-                sdkFileInfo.fileName
-            );
-            ast = typescript_1.createSourceFile(
-              file,
-              fs.readFileSync(file).toString(),
-              typescript_1.ScriptTarget.Latest,
-              true
-            );
-            cloned_1 = null;
-            return [
-              4 /*yield*/,
-              ast.forEachChild(function(child) {
-                if (
-                  typescript_1.SyntaxKind[child.kind] === "ClassDeclaration"
-                ) {
-                  cloned_1 = Object.assign({}, child);
-                }
-              })
-            ];
-          case 1:
-            _a.sent();
-            if (!cloned_1) {
-              reject(new Error("Class not found!"));
-            } else {
-              resolve(cloned_1);
-            }
-            return [3 /*break*/, 3];
-          case 2:
-            error_1 = _a.sent();
-            if (error_1.code === "ENOENT") {
-              reject(new Error("File not found!"));
-            } else {
-              reject(error_1);
-            }
-            return [3 /*break*/, 3];
-          case 3:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var file, ast, cloned_1, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						_a.trys.push([0, 2, , 3]);
+						file = path.join(
+							__dirname,
+							'../../../node_modules/@azure/' +
+								sdkFileInfo.pkgName +
+								'/esm/operations/' +
+								sdkFileInfo.fileName
+						);
+						ast = typescript_1.createSourceFile(
+							file,
+							fs.readFileSync(file).toString(),
+							typescript_1.ScriptTarget.Latest,
+							true
+						);
+						cloned_1 = null;
+						return [
+							4 /*yield*/,
+							ast.forEachChild(function(child) {
+								if (
+									typescript_1.SyntaxKind[child.kind] ===
+									'ClassDeclaration'
+								) {
+									cloned_1 = Object.assign({}, child);
+								}
+							}),
+						];
+					case 1:
+						_a.sent();
+						if (!cloned_1) {
+							reject(new Error('Class not found!'));
+						} else {
+							resolve(cloned_1);
+						}
+						return [3 /*break*/, 3];
+					case 2:
+						error_1 = _a.sent();
+						if (error_1.code === 'ENOENT') {
+							reject(new Error('File not found!'));
+						} else {
+							reject(error_1);
+						}
+						return [3 /*break*/, 3];
+					case 3:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.getAST = getAST;
diff --git a/generator/parsers/do/parser.js b/generator/parsers/do/parser.js
index 3e03d611..e1fb57ec 100644
--- a/generator/parsers/do/parser.js
+++ b/generator/parsers/do/parser.js
@@ -1,194 +1,202 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.getAST = void 0;
-var fs = require("fs");
-var path = require("path");
-var typescript_1 = require("typescript");
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
 function getAST(sdkFileName) {
-  var _this = this;
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var file, ast, cloned_1, error_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2, , 3]);
-            file = path.join(
-              __dirname,
-              "../../../node_modules/do-wrapper/dist/modules/" +
-                sdkFileName.toLowerCase()
-            );
-            ast = typescript_1.createSourceFile(
-              file,
-              fs.readFileSync(file).toString(),
-              typescript_1.ScriptTarget.Latest,
-              true
-            );
-            cloned_1 = null;
-            return [
-              4 /*yield*/,
-              ast.forEachChild(function(child) {
-                if (
-                  typescript_1.SyntaxKind[child.kind] === "ClassDeclaration"
-                ) {
-                  cloned_1 = Object.assign({}, child);
-                }
-              })
-            ];
-          case 1:
-            _a.sent();
-            if (!cloned_1) {
-              reject(new Error("Class not found!"));
-            } else {
-              resolve(cloned_1);
-            }
-            return [3 /*break*/, 3];
-          case 2:
-            error_1 = _a.sent();
-            if (error_1.code === "ENOENT") {
-              reject(new Error("File not found!"));
-            } else {
-              reject(error_1);
-            }
-            return [3 /*break*/, 3];
-          case 3:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var file, ast, cloned_1, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						_a.trys.push([0, 2, , 3]);
+						file = path.join(
+							__dirname,
+							'../../../node_modules/do-wrapper/dist/modules/' +
+								sdkFileName.toLowerCase()
+						);
+						ast = typescript_1.createSourceFile(
+							file,
+							fs.readFileSync(file).toString(),
+							typescript_1.ScriptTarget.Latest,
+							true
+						);
+						cloned_1 = null;
+						return [
+							4 /*yield*/,
+							ast.forEachChild(function(child) {
+								if (
+									typescript_1.SyntaxKind[child.kind] ===
+									'ClassDeclaration'
+								) {
+									cloned_1 = Object.assign({}, child);
+								}
+							}),
+						];
+					case 1:
+						_a.sent();
+						if (!cloned_1) {
+							reject(new Error('Class not found!'));
+						} else {
+							resolve(cloned_1);
+						}
+						return [3 /*break*/, 3];
+					case 2:
+						error_1 = _a.sent();
+						if (error_1.code === 'ENOENT') {
+							reject(new Error('File not found!'));
+						} else {
+							reject(error_1);
+						}
+						return [3 /*break*/, 3];
+					case 3:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.getAST = getAST;
diff --git a/generator/parsers/googleCloud/parser.js b/generator/parsers/googleCloud/parser.js
index 4c9dc64c..1fcf3819 100644
--- a/generator/parsers/googleCloud/parser.js
+++ b/generator/parsers/googleCloud/parser.js
@@ -1,220 +1,234 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.getAST = void 0;
-var fs = require("fs");
-var path = require("path");
-var typescript_1 = require("typescript");
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
 function getAST(sdkFileInfo, multi) {
-  var _this = this;
-  var filePath;
-  if (sdkFileInfo.version) {
-    filePath =
-      "../../../node_modules/@google-cloud/" +
-      sdkFileInfo.pkgName +
-      "/build/src/" +
-      sdkFileInfo.version +
-      "/" +
-      sdkFileInfo.fileName;
-  } else {
-    filePath =
-      "../../../node_modules/@google-cloud/" +
-      sdkFileInfo.pkgName +
-      "/build/src/" +
-      sdkFileInfo.fileName;
-  }
-  return new Promise(function(resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function() {
-      var file, ast, classes_1, cloned, error_1;
-      return __generator(this, function(_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 4, , 5]);
-            file = path.join(__dirname, filePath);
-            ast = typescript_1.createSourceFile(
-              file,
-              fs.readFileSync(file).toString(),
-              typescript_1.ScriptTarget.Latest,
-              true
-            );
-            if (!(multi === true)) return [3 /*break*/, 1];
-            classes_1 = [];
-            ast.forEachChild(function(child) {
-              if (typescript_1.SyntaxKind[child.kind] === "ClassDeclaration") {
-                var cloned = Object.assign({}, child);
-                classes_1.push(cloned);
-              }
-            });
-            resolve(classes_1);
-            return [3 /*break*/, 3];
-          case 1:
-            cloned = null;
-            return [
-              4 /*yield*/,
-              ast.forEachChild(function(child) {
-                if (
-                  typescript_1.SyntaxKind[child.kind] === "ClassDeclaration"
-                ) {
-                  var cloned_1 = Object.assign({}, child);
-                  return resolve(cloned_1);
-                }
-              })
-            ];
-          case 2:
-            _a.sent();
-            if (!cloned) {
-              return [2 /*return*/, reject(new Error("Class not found!"))];
-            } else {
-              return [2 /*return*/, resolve(cloned)];
-            }
-            _a.label = 3;
-          case 3:
-            return [3 /*break*/, 5];
-          case 4:
-            error_1 = _a.sent();
-            if (error_1.code === "ENOENT") {
-              reject(new Error("File not found!"));
-            } else {
-              reject(error_1);
-            }
-            return [3 /*break*/, 5];
-          case 5:
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
+	var _this = this;
+	var filePath;
+	if (sdkFileInfo.version) {
+		filePath =
+			'../../../node_modules/@google-cloud/' +
+			sdkFileInfo.pkgName +
+			'/build/src/' +
+			sdkFileInfo.version +
+			'/' +
+			sdkFileInfo.fileName;
+	} else {
+		filePath =
+			'../../../node_modules/@google-cloud/' +
+			sdkFileInfo.pkgName +
+			'/build/src/' +
+			sdkFileInfo.fileName;
+	}
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var file, ast, classes_1, cloned, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						_a.trys.push([0, 4, , 5]);
+						file = path.join(__dirname, filePath);
+						ast = typescript_1.createSourceFile(
+							file,
+							fs.readFileSync(file).toString(),
+							typescript_1.ScriptTarget.Latest,
+							true
+						);
+						if (!(multi === true)) return [3 /*break*/, 1];
+						classes_1 = [];
+						ast.forEachChild(function(child) {
+							if (
+								typescript_1.SyntaxKind[child.kind] ===
+								'ClassDeclaration'
+							) {
+								var cloned = Object.assign({}, child);
+								classes_1.push(cloned);
+							}
+						});
+						resolve(classes_1);
+						return [3 /*break*/, 3];
+					case 1:
+						cloned = null;
+						return [
+							4 /*yield*/,
+							ast.forEachChild(function(child) {
+								if (
+									typescript_1.SyntaxKind[child.kind] ===
+									'ClassDeclaration'
+								) {
+									var cloned_1 = Object.assign({}, child);
+									return resolve(cloned_1);
+								}
+							}),
+						];
+					case 2:
+						_a.sent();
+						if (!cloned) {
+							return [
+								2 /*return*/,
+								reject(new Error('Class not found!')),
+							];
+						} else {
+							return [2 /*return*/, resolve(cloned)];
+						}
+						_a.label = 3;
+					case 3:
+						return [3 /*break*/, 5];
+					case 4:
+						error_1 = _a.sent();
+						if (error_1.code === 'ENOENT') {
+							reject(new Error('File not found!'));
+						} else {
+							reject(error_1);
+						}
+						return [3 /*break*/, 5];
+					case 5:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
 }
 exports.getAST = getAST;
diff --git a/generator/parsers/googleCloud/parser.ts b/generator/parsers/googleCloud/parser.ts
index b8701074..1cf53b17 100644
--- a/generator/parsers/googleCloud/parser.ts
+++ b/generator/parsers/googleCloud/parser.ts
@@ -1,55 +1,55 @@
-import * as fs from "fs";
-import * as path from "path";
-import { createSourceFile, ScriptTarget, SyntaxKind } from "typescript";
+import * as fs from 'fs';
+import * as path from 'path';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
 
 export function getAST(sdkFileInfo, multi?: boolean) {
-  let filePath;
-  if (sdkFileInfo.version) {
-    filePath = `../../../node_modules/@google-cloud/${sdkFileInfo.pkgName}/build/src/${sdkFileInfo.version}/${sdkFileInfo.fileName}`;
-  } else {
-    filePath = `../../../node_modules/@google-cloud/${sdkFileInfo.pkgName}/build/src/${sdkFileInfo.fileName}`;
-  }
+	let filePath;
+	if (sdkFileInfo.version) {
+		filePath = `../../../node_modules/@google-cloud/${sdkFileInfo.pkgName}/build/src/${sdkFileInfo.version}/${sdkFileInfo.fileName}`;
+	} else {
+		filePath = `../../../node_modules/@google-cloud/${sdkFileInfo.pkgName}/build/src/${sdkFileInfo.fileName}`;
+	}
 
-  return new Promise(async (resolve, reject) => {
-    try {
-      const file = path.join(__dirname, filePath);
-      const ast = createSourceFile(
-        file,
-        fs.readFileSync(file).toString(),
-        ScriptTarget.Latest,
-        true
-      );
+	return new Promise(async (resolve, reject) => {
+		try {
+			const file = path.join(__dirname, filePath);
+			const ast = createSourceFile(
+				file,
+				fs.readFileSync(file).toString(),
+				ScriptTarget.Latest,
+				true
+			);
 
-      if (multi === true) {
-        let classes = [];
-        ast.forEachChild(child => {
-          if (SyntaxKind[child.kind] === "ClassDeclaration") {
-            let cloned = Object.assign({}, child);
-            classes.push(cloned);
-          }
-        });
-        resolve(classes);
-      } else {
-        let cloned = null;
-        await ast.forEachChild(child => {
-          if (SyntaxKind[child.kind] === "ClassDeclaration") {
-            let cloned = Object.assign({}, child);
-            return resolve(cloned);
-          }
-        });
+			if (multi === true) {
+				const classes = [];
+				ast.forEachChild(child => {
+					if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+						const cloned = Object.assign({}, child);
+						classes.push(cloned);
+					}
+				});
+				resolve(classes);
+			} else {
+				const cloned = null;
+				await ast.forEachChild(child => {
+					if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+						const cloned = Object.assign({}, child);
+						return resolve(cloned);
+					}
+				});
 
-        if (!cloned) {
-          return reject(new Error("Class not found!"));
-        } else {
-          return resolve(cloned);
-        }
-      }
-    } catch (error) {
-      if (error.code === "ENOENT") {
-        reject(new Error("File not found!"));
-      } else {
-        reject(error);
-      }
-    }
-  });
+				if (!cloned) {
+					return reject(new Error('Class not found!'));
+				} else {
+					return resolve(cloned);
+				}
+			}
+		} catch (error) {
+			if (error.code === 'ENOENT') {
+				reject(new Error('File not found!'));
+			} else {
+				reject(error);
+			}
+		}
+	});
 }
diff --git a/generator/parsers/oracle/parser.js b/generator/parsers/oracle/parser.js
new file mode 100644
index 00000000..f4c2d584
--- /dev/null
+++ b/generator/parsers/oracle/parser.js
@@ -0,0 +1,204 @@
+'use strict';
+var __awaiter =
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
+var __generator =
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
+exports.__esModule = true;
+exports.getAST = void 0;
+var fs = require('fs');
+var path = require('path');
+var typescript_1 = require('typescript');
+function getAST(sdkFileName) {
+	var _this = this;
+	return new Promise(function(resolve, reject) {
+		return __awaiter(_this, void 0, void 0, function() {
+			var file, ast, cloned_1, error_1;
+			return __generator(this, function(_a) {
+				switch (_a.label) {
+					case 0:
+						_a.trys.push([0, 2, , 3]);
+						file = path.join(
+							__dirname,
+							'../../../node_modules/oci-' +
+								sdkFileName.toLowerCase() +
+								'/lib/client.d.ts'
+						);
+						ast = typescript_1.createSourceFile(
+							file,
+							fs.readFileSync(file).toString(),
+							typescript_1.ScriptTarget.Latest,
+							true
+						);
+						cloned_1 = null;
+						return [
+							4 /*yield*/,
+							ast.forEachChild(function(child) {
+								// console.log(SyntaxKind[child.kind]);
+								if (
+									typescript_1.SyntaxKind[child.kind] ===
+									'ClassDeclaration'
+								) {
+									cloned_1 = Object.assign({}, child);
+								}
+							}),
+						];
+					case 1:
+						_a.sent();
+						if (!cloned_1) {
+							reject(new Error('Class not found!'));
+						} else {
+							resolve(cloned_1);
+						}
+						return [3 /*break*/, 3];
+					case 2:
+						error_1 = _a.sent();
+						if (error_1.code === 'ENOENT') {
+							reject(new Error('File not found!'));
+						} else {
+							reject(error_1);
+						}
+						return [3 /*break*/, 3];
+					case 3:
+						return [2 /*return*/];
+				}
+			});
+		});
+	});
+}
+exports.getAST = getAST;
diff --git a/generator/parsers/oracle/parser.ts b/generator/parsers/oracle/parser.ts
new file mode 100644
index 00000000..d7ce9618
--- /dev/null
+++ b/generator/parsers/oracle/parser.ts
@@ -0,0 +1,42 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { createSourceFile, ScriptTarget, SyntaxKind } from 'typescript';
+
+export function getAST(sdkFileName) {
+	return new Promise(async (resolve, reject) => {
+		try {
+			const file = path.join(
+				__dirname,
+				`../../../node_modules/oci-${sdkFileName.toLowerCase()}/lib/client.d.ts`
+			);
+			const ast = createSourceFile(
+				file,
+				fs.readFileSync(file).toString(),
+				ScriptTarget.Latest,
+				true
+			);
+
+			let cloned = null;
+
+			await ast.forEachChild(child => {
+				// console.log(SyntaxKind[child.kind]);
+
+				if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+					cloned = Object.assign({}, child);
+				}
+			});
+
+			if (!cloned) {
+				reject(new Error('Class not found!'));
+			} else {
+				resolve(cloned);
+			}
+		} catch (error) {
+			if (error.code === 'ENOENT') {
+				reject(new Error('File not found!'));
+			} else {
+				reject(error);
+			}
+		}
+	});
+}
diff --git a/generator/test/generators/googleCloud/generator.test.ts b/generator/test/generators/googleCloud/generator.test.ts
index 3b339d3c..0702d965 100644
--- a/generator/test/generators/googleCloud/generator.test.ts
+++ b/generator/test/generators/googleCloud/generator.test.ts
@@ -1,159 +1,163 @@
-import { expect } from "chai";
-import { SyntaxKind } from "typescript";
+import { expect } from 'chai';
+import { SyntaxKind } from 'typescript';
 
 import {
-  extractClassBasedSDKData,
-  extractClientBasedSDKdata
-} from "../../../generators/googleCloud/generator";
-import { readJsonData, readSourceFile } from "../lib/helper";
-
-describe("GCP generator extractClassBasedSDKData", () => {
-  context("with valid methods and valid AST", () => {
-    it("should return class data", async () => {
-      const methods: any = await readJsonData(
-        "validDataset_1",
-        "googleCloud",
-        "methods"
-      );
-
-      const sdkFiles: any = await readJsonData(
-        "validDataset_1",
-        "googleCloud",
-        "files"
-      );
-
-      await Promise.all(
-        sdkFiles.map(async file => {
-          file.classes = [];
-          const sdkFile: any = await readSourceFile(
-            "validDataset_1",
-            "googleCloud"
-          );
-          sdkFile.forEachChild(child => {
-            if (SyntaxKind[child.kind] === "ClassDeclaration") {
-              let cloned = Object.assign({}, child);
-              file.classes.push(cloned);
-            }
-          });
-        })
-      );
-
-      extractClassBasedSDKData(methods, sdkFiles).then(result => {
-        expect(result).to.be.an("object");
-        expect(result.methods).to.be.an("array");
-      });
-    });
-  });
-
-  context("with invalid AST", () => {
-    it("should return Error", async () => {
-      const methods: any = await readJsonData(
-        "invalidDataset_1",
-        "googleCloud",
-        "methods"
-      );
-
-      const sdkFiles: any = await readJsonData(
-        "invalidDataset_1",
-        "googleCloud",
-        "files"
-      );
-
-      await Promise.all(
-        sdkFiles.map(async file => {
-          file.classes = [];
-          const sdkFile: any = await readSourceFile(
-            "invalidDataset_1",
-            "googleCloud"
-          );
-          sdkFile.forEachChild(child => {
-            if (SyntaxKind[child.kind] === "ClassDeclaration") {
-              let cloned = Object.assign({}, child);
-              file.classes.push(cloned);
-            }
-          });
-        })
-      );
-
-      extractClassBasedSDKData(methods, sdkFiles).then(
-        result => {},
-        error => {
-          expect(error.message).to.eql("Data extraction unsuccessful");
-        }
-      );
-    });
-  });
+	extractClassBasedSDKData,
+	extractClientBasedSDKdata,
+} from '../../../generators/googleCloud/generator';
+import { readJsonData, readSourceFile } from '../lib/helper';
+
+describe('GCP generator extractClassBasedSDKData', () => {
+	context('with valid methods and valid AST', () => {
+		it('should return class data', async () => {
+			const methods: any = await readJsonData(
+				'validDataset_1',
+				'googleCloud',
+				'methods'
+			);
+
+			const sdkFiles: any = await readJsonData(
+				'validDataset_1',
+				'googleCloud',
+				'files'
+			);
+
+			await Promise.all(
+				sdkFiles.map(async file => {
+					file.classes = [];
+					const sdkFile: any = await readSourceFile(
+						'validDataset_1',
+						'googleCloud'
+					);
+					sdkFile.forEachChild(child => {
+						if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+							const cloned = Object.assign({}, child);
+							file.classes.push(cloned);
+						}
+					});
+				})
+			);
+
+			extractClassBasedSDKData(methods, sdkFiles).then(result => {
+				expect(result).to.be.an('object');
+				expect(result.methods).to.be.an('array');
+			});
+		});
+	});
+
+	context('with invalid AST', () => {
+		it('should return Error', async () => {
+			const methods: any = await readJsonData(
+				'invalidDataset_1',
+				'googleCloud',
+				'methods'
+			);
+
+			const sdkFiles: any = await readJsonData(
+				'invalidDataset_1',
+				'googleCloud',
+				'files'
+			);
+
+			await Promise.all(
+				sdkFiles.map(async file => {
+					file.classes = [];
+					const sdkFile: any = await readSourceFile(
+						'invalidDataset_1',
+						'googleCloud'
+					);
+					sdkFile.forEachChild(child => {
+						if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+							const cloned = Object.assign({}, child);
+							file.classes.push(cloned);
+						}
+					});
+				})
+			);
+
+			extractClassBasedSDKData(methods, sdkFiles).then(
+				result => {},
+				error => {
+					expect(error.message).to.eql(
+						'Data extraction unsuccessful'
+					);
+				}
+			);
+		});
+	});
 });
 
-describe("GCP generator extractClientBasedSDKdata", () => {
-  context("with valid methods and valid AST", () => {
-    it("should return class data", async () => {
-      const methods: any = await readJsonData(
-        "validDataset_2",
-        "googleCloud",
-        "methods"
-      );
-
-      const sdkFiles: any = await readJsonData(
-        "validDataset_2",
-        "googleCloud",
-        "files"
-      );
-
-      await Promise.all(
-        sdkFiles.map(async file => {
-          const sdkFile: any = await readSourceFile(
-            "validDataset_2",
-            "googleCloud"
-          );
-          sdkFile.forEachChild(child => {
-            if (SyntaxKind[child.kind] === "ClassDeclaration") {
-              file.ast = Object.assign({}, child);
-            }
-          });
-        })
-      );
-
-      extractClientBasedSDKdata(methods, sdkFiles).then(result => {
-        expect(result).to.be.an("array");
-      });
-    });
-  });
-
-  context("with invalid AST", () => {
-    it("should return Error", async () => {
-      const methods: any = await readJsonData(
-        "invalidDataset_2",
-        "googleCloud",
-        "methods"
-      );
-
-      const sdkFiles: any = await readJsonData(
-        "invalidDataset_2",
-        "googleCloud",
-        "files"
-      );
-
-      await Promise.all(
-        sdkFiles.map(async file => {
-          const sdkFile: any = await readSourceFile(
-            "invalidDataset_2",
-            "googleCloud"
-          );
-          sdkFile.forEachChild(child => {
-            if (SyntaxKind[child.kind] === "ClassDeclaration") {
-              file.ast = Object.assign({}, child);
-            }
-          });
-        })
-      );
-
-      extractClientBasedSDKdata(methods, sdkFiles).then(
-        result => {},
-        error => {
-          expect(error.message).to.eql("Data extraction unsuccessful");
-        }
-      );
-    });
-  });
+describe('GCP generator extractClientBasedSDKdata', () => {
+	context('with valid methods and valid AST', () => {
+		it('should return class data', async () => {
+			const methods: any = await readJsonData(
+				'validDataset_2',
+				'googleCloud',
+				'methods'
+			);
+
+			const sdkFiles: any = await readJsonData(
+				'validDataset_2',
+				'googleCloud',
+				'files'
+			);
+
+			await Promise.all(
+				sdkFiles.map(async file => {
+					const sdkFile: any = await readSourceFile(
+						'validDataset_2',
+						'googleCloud'
+					);
+					sdkFile.forEachChild(child => {
+						if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+							file.ast = Object.assign({}, child);
+						}
+					});
+				})
+			);
+
+			extractClientBasedSDKdata(methods, sdkFiles).then(result => {
+				expect(result).to.be.an('array');
+			});
+		});
+	});
+
+	context('with invalid AST', () => {
+		it('should return Error', async () => {
+			const methods: any = await readJsonData(
+				'invalidDataset_2',
+				'googleCloud',
+				'methods'
+			);
+
+			const sdkFiles: any = await readJsonData(
+				'invalidDataset_2',
+				'googleCloud',
+				'files'
+			);
+
+			await Promise.all(
+				sdkFiles.map(async file => {
+					const sdkFile: any = await readSourceFile(
+						'invalidDataset_2',
+						'googleCloud'
+					);
+					sdkFile.forEachChild(child => {
+						if (SyntaxKind[child.kind] === 'ClassDeclaration') {
+							file.ast = Object.assign({}, child);
+						}
+					});
+				})
+			);
+
+			extractClientBasedSDKdata(methods, sdkFiles).then(
+				result => {},
+				error => {
+					expect(error.message).to.eql(
+						'Data extraction unsuccessful'
+					);
+				}
+			);
+		});
+	});
 });
diff --git a/generator/transformers/aws/transformer.js b/generator/transformers/aws/transformer.js
index 90312335..da809d1a 100644
--- a/generator/transformers/aws/transformer.js
+++ b/generator/transformers/aws/transformer.js
@@ -1,407 +1,450 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.transform = void 0;
-var ts = require("typescript");
-var lodash_1 = require("lodash");
+var lodash_1 = require('lodash');
+var ts = require('typescript');
 var dummyIdentifiers = [
-  "ClassName",
-  "_sdkClassName",
-  "SDKClassName",
-  "SDKFunctionName"
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
 ];
 var printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 function addMultiLineComment(node, comment) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 function runTransformation(sourceCode, transformMethod) {
-  return new Promise(function(resolve, reject) {
-    try {
-      var result = ts.transform(sourceCode, [transformMethod]);
-      var transformedNodes = result.transformed[0];
-      var output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 function toSourceFile(sourceCode) {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 function transform(code, classData) {
-  return __awaiter(this, void 0, void 0, function() {
-    var addFunctions,
-      addIdentifiers,
-      addComments,
-      node,
-      result_1,
-      result_2,
-      result_3;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          addFunctions = function(context) {
-            return function(rootNode) {
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  var functions_1 = [];
-                  classData.functions.map(function(method) {
-                    var clonedNode = Object.assign({}, node.members[1]);
-                    clonedNode.name = ts.createIdentifier(method.functionName);
-                    functions_1.push(clonedNode);
-                  });
-                  var updatedClass = ts.updateClassDeclaration(
-                    node,
-                    node.decorators,
-                    node.modifiers,
-                    node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
-                    ts.createNodeArray([node.members[0]].concat(functions_1))
-                  );
-                  return updatedClass;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addIdentifiers = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var paramNode = ts.createParameter(
-                        undefined,
-                        undefined,
-                        undefined,
-                        param.name
-                      );
-                      if (param.optional) {
-                        paramNode.initializer = ts.createIdentifier(
-                          "undefined"
-                        );
-                      }
-                      return paramNode;
-                    }
-                  );
-                  node.parameters = parameters;
-                }
-                if (
-                  ts.isIdentifier(node) &&
-                  dummyIdentifiers.includes(node.text)
-                ) {
-                  var updatedIdentifier = void 0;
-                  switch (node.text) {
-                    case "ClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("AWS_" + classData.serviceName)
-                      );
-                      break;
-                    case "_sdkClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          "_" +
-                            classData.className.charAt(0).toLowerCase() +
-                            classData.className.substr(1)
-                        )
-                      );
-                      break;
-                    case "SDKClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(classData.className)
-                      );
-                      break;
-                    case "SDKFunctionName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.functions[count].SDKFunctionName
-                        )
-                      );
-                      count++;
-                  }
-                  return updatedIdentifier;
-                }
-                if (ts.isCallExpression(node)) {
-                  node.expression.forEachChild(function(childNode) {
-                    if (
-                      ts.isIdentifier(childNode) &&
-                      childNode.text === "SDKFunctionName"
-                    ) {
-                      var args = classData.functions[count].params.map(function(
-                        param
-                      ) {
-                        return ts.createIdentifier(param.name);
-                      });
-                      node.arguments = args.concat(node.arguments);
-                    }
-                  });
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addComments = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  addMultiLineComment(
-                    node,
-                    "This is an auto generated class, please do not change."
-                  );
-                  var comment =
-                    "*\n * Class to create a " +
-                    classData.className +
-                    " object\n * @category AWS       \n ";
-                  addMultiLineComment(node, comment);
-                }
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var statment;
-                      if (param.optional) {
-                        statment =
-                          "* @param {" +
-                          param.typeName +
-                          "} [" +
-                          param.name +
-                          "] - Data required for " +
-                          classData.functions[count].SDKFunctionName;
-                      } else {
-                        statment =
-                          "* @param {" +
-                          param.typeName +
-                          "} " +
-                          param.name +
-                          " - Data required for " +
-                          classData.functions[count].SDKFunctionName;
-                      }
-                      return statment;
-                    }
-                  );
-                  var comment = void 0;
-                  if (parameters.length > 0) {
-                    var paramStatments_1 = "";
-                    parameters.map(function(param) {
-                      paramStatments_1 = paramStatments_1.concat(
-                        paramStatments_1 === "" ? "" + param : "\n " + param
-                      );
-                    });
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.className +
-                      "\n " +
-                      paramStatments_1 +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  } else {
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.className +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  }
-                  addMultiLineComment(node, comment);
-                  count++;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          node = code.statements.find(function(stm) {
-            return ts.isClassDeclaration(stm);
-          });
-          if (!classData.className || !classData.functions) {
-            throw new Error("Input is invalid");
-          }
-          if (
-            !node ||
-            !node.members.some(function(member) {
-              return ts.isMethodDeclaration(member);
-            })
-          ) {
-            throw new Error("Code is invalid");
-          }
-          code = lodash_1.cloneDeep(code);
-          return [4 /*yield*/, runTransformation(code, addFunctions)];
-        case 1:
-          result_1 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_1), addIdentifiers)
-          ];
-        case 2:
-          result_2 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_2), addComments)
-          ];
-        case 3:
-          result_3 = _a.sent();
-          return [2 /*return*/, result_3];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var addFunctions,
+			addIdentifiers,
+			addComments,
+			node,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									classData.functions.map(function(method) {
+										var clonedNode = Object.assign(
+											{},
+											node.members[1]
+										);
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters;
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'AWS_' +
+														classData.serviceName
+												)
+											);
+											break;
+										case '_sdkClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														classData.className
+															.charAt(0)
+															.toLowerCase() +
+														classData.className.substr(
+															1
+														)
+												)
+											);
+											break;
+										case 'SDKClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.className
+												)
+											);
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = classData.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args.concat(
+												node.arguments
+											);
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n * Class to create a ' +
+										classData.className +
+										' object\n * @category AWS       \n ';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var statment;
+										if (param.optional) {
+											statment =
+												'* @param {' +
+												param.typeName +
+												'} [' +
+												param.name +
+												'] - Data required for ' +
+												classData.functions[count]
+													.SDKFunctionName;
+										} else {
+											statment =
+												'* @param {' +
+												param.typeName +
+												'} ' +
+												param.name +
+												' - Data required for ' +
+												classData.functions[count]
+													.SDKFunctionName;
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n ' + param
+											);
+										});
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n ' +
+											paramStatments_1 +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									} else {
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!classData.className || !classData.functions) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
 }
 exports.transform = transform;
diff --git a/generator/transformers/aws/transformer.ts b/generator/transformers/aws/transformer.ts
index 31230633..ed063fe9 100644
--- a/generator/transformers/aws/transformer.ts
+++ b/generator/transformers/aws/transformer.ts
@@ -1,239 +1,252 @@
-import { cloneDeep } from "lodash";
-import * as ts from "typescript";
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
 
 const dummyIdentifiers = [
-  "ClassName",
-  "_sdkClassName",
-  "SDKClassName",
-  "SDKFunctionName"
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
 ];
 
 const printer: ts.Printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 
 function addMultiLineComment(node, comment: string) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 
 function runTransformation(sourceCode, transformMethod): Promise<string> {
-  return new Promise((resolve, reject) => {
-    try {
-      const result = ts.transform(sourceCode, [transformMethod]);
-      const transformedNodes = result.transformed[0];
-      const output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 function toSourceFile(sourceCode: string): ts.SourceFile {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 
 export async function transform(
-  code: ts.SourceFile,
-  classData: any
+	code: ts.SourceFile,
+	classData: any
 ): Promise<string> {
-  const addFunctions = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        let functions: any = [];
-        classData.functions.map(method => {
-          const clonedNode = Object.assign({}, node.members[1]);
-          clonedNode.name = ts.createIdentifier(method.functionName);
-          functions.push(clonedNode);
-        });
-
-        const updatedClass = ts.updateClassDeclaration(
-          node,
-          node.decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          ts.createNodeArray([node.members[0]].concat(functions))
-        );
-
-        return updatedClass;
-      }
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const addIdentifiers = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isMethodDeclaration(node)) {
-        const parameters = classData.functions[count].params.map(param => {
-          const paramNode = ts.createParameter(
-            undefined,
-            undefined,
-            undefined,
-            param.name
-          );
-
-          if (param.optional) {
-            paramNode.initializer = ts.createIdentifier("undefined");
-          }
-
-          return paramNode;
-        });
-
-        node.parameters = parameters;
-      }
-
-      if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
-        let updatedIdentifier;
-
-        switch (node.text) {
-          case "ClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("AWS_" + classData.serviceName)
-            );
-            break;
-          case "_sdkClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                "_" +
-                  classData.className.charAt(0).toLowerCase() +
-                  classData.className.substr(1)
-              )
-            );
-            break;
-          case "SDKClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.className)
-            );
-            break;
-          case "SDKFunctionName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.functions[count].SDKFunctionName)
-            );
-            count++;
-        }
-
-        return updatedIdentifier;
-      }
-
-      if (ts.isCallExpression(node)) {
-        node.expression.forEachChild(childNode => {
-          if (
-            ts.isIdentifier(childNode) &&
-            childNode.text === "SDKFunctionName"
-          ) {
-            const args = classData.functions[count].params.map(param =>
-              ts.createIdentifier(param.name)
-            );
-            node.arguments = args.concat(node.arguments);
-          }
-        });
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const addComments = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        addMultiLineComment(
-          node,
-          "This is an auto generated class, please do not change."
-        );
-        const comment = `*
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				classData.functions.map(method => {
+					const clonedNode = Object.assign({}, node.members[1]);
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
+
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
+
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						const paramNode = ts.createParameter(
+							undefined,
+							undefined,
+							undefined,
+							param.name
+						);
+
+						if (param.optional) {
+							paramNode.initializer = ts.createIdentifier(
+								'undefined'
+							);
+						}
+
+						return paramNode;
+					}
+				);
+
+				node.parameters = parameters;
+			}
+
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier('AWS_' + classData.serviceName)
+						);
+						break;
+					case '_sdkClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' +
+									classData.className
+										.charAt(0)
+										.toLowerCase() +
+									classData.className.substr(1)
+							)
+						);
+						break;
+					case 'SDKClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(classData.className)
+						);
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+				}
+
+				return updatedIdentifier;
+			}
+
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = classData.functions[count].params.map(
+							param => ts.createIdentifier(param.name)
+						);
+						node.arguments = args.concat(node.arguments);
+					}
+				});
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
  * Class to create a ${classData.className} object
  * @category AWS       
  `;
-        addMultiLineComment(node, comment);
-      }
-
-      if (ts.isMethodDeclaration(node)) {
-        let parameters = classData.functions[count].params.map(param => {
-          let statment;
-
-          if (param.optional) {
-            statment = `* @param {${param.typeName}} [${param.name}] - Data required for ${classData.functions[count].SDKFunctionName}`;
-          } else {
-            statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-          }
-          return statment;
-        });
-
-        let comment;
-        if (parameters.length > 0) {
-          let paramStatments: string = "";
-          parameters.map(param => {
-            paramStatments = paramStatments.concat(
-              paramStatments === "" ? `${param}` : `\n ${param}`
-            );
-          });
-
-          comment = `*
+				addMultiLineComment(node, comment);
+			}
+
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						let statment;
+
+						if (param.optional) {
+							statment = `* @param {${param.typeName}} [${param.name}] - Data required for ${classData.functions[count].SDKFunctionName}`;
+						} else {
+							statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						}
+						return statment;
+					}
+				);
+
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n ${param}`
+						);
+					});
+
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
  ${paramStatments}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        } else {
-          comment = `*
+				} else {
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        }
-
-        addMultiLineComment(node, comment);
-        count++;
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
-
-  if (!classData.className || !classData.functions) {
-    throw new Error("Input is invalid");
-  }
-
-  if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
-    throw new Error("Code is invalid");
-  }
-
-  code = cloneDeep(code);
-
-  const result_1 = await runTransformation(code, addFunctions);
-  const result_2 = await runTransformation(
-    toSourceFile(result_1),
-    addIdentifiers
-  );
-  const result_3 = await runTransformation(toSourceFile(result_2), addComments);
-  return result_3;
+				}
+
+				addMultiLineComment(node, comment);
+				count++;
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+
+	if (!classData.className || !classData.functions) {
+		throw new Error('Input is invalid');
+	}
+
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
+
+	code = cloneDeep(code);
+
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
 }
diff --git a/generator/transformers/azure/transformer.js b/generator/transformers/azure/transformer.js
index 1ae0748d..069cea3a 100644
--- a/generator/transformers/azure/transformer.js
+++ b/generator/transformers/azure/transformer.js
@@ -1,428 +1,480 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.transform = void 0;
-var ts = require("typescript");
-var lodash_1 = require("lodash");
+var lodash_1 = require('lodash');
+var ts = require('typescript');
 var dummyIdentifiers = [
-  "ClassName",
-  "SDKClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "functionClient"
+	'ClassName',
+	'SDKClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'functionClient',
 ];
 var printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 function addMultiLineComment(node, comment) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 function runTransformation(sourceCode, transformMethod) {
-  return new Promise(function(resolve, reject) {
-    try {
-      var result = ts.transform(sourceCode, [transformMethod]);
-      var transformedNodes = result.transformed[0];
-      var output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 function toSourceFile(sourceCode) {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 function transform(code, classData) {
-  return __awaiter(this, void 0, void 0, function() {
-    var node,
-      importStatments,
-      addFunctions,
-      addIdentifiers,
-      addComments,
-      result_1,
-      result_2,
-      result_3;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          node = code.statements.find(function(stm) {
-            return ts.isClassDeclaration(stm);
-          });
-          if (!classData.functions) {
-            throw new Error("Input is invalid");
-          }
-          if (
-            !node ||
-            !node.members.some(function(member) {
-              return ts.isMethodDeclaration(member);
-            })
-          ) {
-            throw new Error("Code is invalid");
-          }
-          code = lodash_1.cloneDeep(code);
-          // import related
-          classData.clients = Array.from(
-            new Set(
-              classData.functions.map(function(method) {
-                return method.client;
-              })
-            )
-          );
-          importStatments = new Array(classData.clients.length);
-          importStatments.fill(Object.assign({}, code.statements[0]));
-          code.statements = importStatments.concat(code.statements.slice(1));
-          addFunctions = function(context) {
-            return function(rootNode) {
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  var functions_1 = [];
-                  classData.functions.map(function(method) {
-                    var clonedNode = Object.assign({}, node.members[1]);
-                    clonedNode.name = ts.createIdentifier(method.functionName);
-                    functions_1.push(clonedNode);
-                  });
-                  var updatedClass = ts.updateClassDeclaration(
-                    node,
-                    node.decorators,
-                    node.modifiers,
-                    node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
-                    ts.createNodeArray([node.members[0]].concat(functions_1))
-                  );
-                  return updatedClass;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addIdentifiers = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              var clientCount = 0;
-              function visit(node) {
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var paramNode = ts.createParameter(
-                        undefined,
-                        undefined,
-                        undefined,
-                        param.name
-                      );
-                      if (param.optional) {
-                        paramNode.initializer = ts.createIdentifier(
-                          "undefined"
-                        );
-                      }
-                      return paramNode;
-                    }
-                  );
-                  node.parameters = parameters;
-                }
-                if (ts.isStringLiteral(node) && node.text === "pkgName") {
-                  return ts.createStringLiteral(
-                    "@azure/" + classData.functions[0].pkgName
-                  );
-                }
-                if (
-                  ts.isIdentifier(node) &&
-                  dummyIdentifiers.includes(node.text)
-                ) {
-                  var updatedIdentifier = void 0;
-                  switch (node.text) {
-                    case "ClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("Azure_" + classData.serviceName)
-                      );
-                      break;
-                    case "SDKClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.functions[count].fileName.split(".")[0]
-                        )
-                      );
-                      break;
-                    case "functionClient":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(classData.functions[count].client)
-                      );
-                      break;
-                    case "ClientName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(classData.clients[clientCount])
-                      );
-                      clientCount++;
-                      break;
-                    case "SDKFunctionName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.functions[count].SDKFunctionName
-                        )
-                      );
-                      count++;
-                  }
-                  return updatedIdentifier;
-                }
-                if (ts.isCallExpression(node)) {
-                  node.expression.forEachChild(function(childNode) {
-                    if (
-                      ts.isIdentifier(childNode) &&
-                      childNode.text === "SDKFunctionName"
-                    ) {
-                      var args = classData.functions[count].params.map(function(
-                        param
-                      ) {
-                        return ts.createIdentifier(param.name);
-                      });
-                      node.arguments = args;
-                    }
-                  });
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addComments = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  addMultiLineComment(
-                    node,
-                    "This is an auto generated class, please do not change."
-                  );
-                  var comment =
-                    "*\n * Class to create a " +
-                    classData.serviceName +
-                    " object\n * @category Azure\n ";
-                  addMultiLineComment(node, comment);
-                }
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var statment;
-                      if (param.optional) {
-                        statment =
-                          "* @param {" +
-                          param.type +
-                          "} [" +
-                          param.name +
-                          "] - Optional parameter";
-                      } else {
-                        statment =
-                          "* @param {" +
-                          param.type +
-                          "} " +
-                          param.name +
-                          " - Mandatory parameter";
-                      }
-                      return statment;
-                    }
-                  );
-                  var comment = void 0;
-                  if (parameters.length > 0) {
-                    var paramStatments_1 = "";
-                    parameters.map(function(param) {
-                      paramStatments_1 = paramStatments_1.concat(
-                        paramStatments_1 === "" ? "" + param : "\n " + param
-                      );
-                    });
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.functions[0].pkgName.split("-")[1] +
-                      "\n " +
-                      paramStatments_1 +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  } else {
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.functions[0].pkgName.split("-")[1] +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  }
-                  addMultiLineComment(node, comment);
-                  count++;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          return [4 /*yield*/, runTransformation(code, addFunctions)];
-        case 1:
-          result_1 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_1), addIdentifiers)
-          ];
-        case 2:
-          result_2 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_2), addComments)
-          ];
-        case 3:
-          result_3 = _a.sent();
-          return [2 /*return*/, result_3];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var node,
+			importStatments,
+			addFunctions,
+			addIdentifiers,
+			addComments,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!classData.functions) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					// import related
+					classData.clients = Array.from(
+						new Set(
+							classData.functions.map(function(method) {
+								return method.client;
+							})
+						)
+					);
+					importStatments = new Array(classData.clients.length);
+					importStatments.fill(Object.assign({}, code.statements[0]));
+					code.statements = importStatments.concat(
+						code.statements.slice(1)
+					);
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									classData.functions.map(function(method) {
+										var clonedNode = Object.assign(
+											{},
+											node.members[1]
+										);
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							var clientCount = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters;
+								}
+								if (
+									ts.isStringLiteral(node) &&
+									node.text === 'pkgName'
+								) {
+									return ts.createStringLiteral(
+										'@azure/' +
+											classData.functions[0].pkgName
+									);
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'Azure_' +
+														classData.serviceName
+												)
+											);
+											break;
+										case 'SDKClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[
+														count
+													].fileName.split('.')[0]
+												)
+											);
+											break;
+										case 'functionClient':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.client
+												)
+											);
+											break;
+										case 'ClientName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.clients[
+														clientCount
+													]
+												)
+											);
+											clientCount++;
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = classData.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args;
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n * Class to create a ' +
+										classData.serviceName +
+										' object\n * @category Azure\n ';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var statment;
+										if (param.optional) {
+											statment =
+												'* @param {' +
+												param.type +
+												'} [' +
+												param.name +
+												'] - Optional parameter';
+										} else {
+											statment =
+												'* @param {' +
+												param.type +
+												'} ' +
+												param.name +
+												' - Mandatory parameter';
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n ' + param
+											);
+										});
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.functions[0].pkgName.split(
+												'-'
+											)[1] +
+											'\n ' +
+											paramStatments_1 +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									} else {
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.functions[0].pkgName.split(
+												'-'
+											)[1] +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
 }
 exports.transform = transform;
diff --git a/generator/transformers/azure/transformer.ts b/generator/transformers/azure/transformer.ts
index 1c9fd106..e27a4ef6 100644
--- a/generator/transformers/azure/transformer.ts
+++ b/generator/transformers/azure/transformer.ts
@@ -1,262 +1,279 @@
-import { cloneDeep } from "lodash";
-import * as ts from "typescript";
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
 
 const dummyIdentifiers = [
-  "ClassName",
-  "SDKClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "functionClient"
+	'ClassName',
+	'SDKClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'functionClient',
 ];
 
 const printer: ts.Printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 
 function addMultiLineComment(node, comment: string) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 
 function runTransformation(sourceCode, transformMethod): Promise<string> {
-  return new Promise((resolve, reject) => {
-    try {
-      const result = ts.transform(sourceCode, [transformMethod]);
-      const transformedNodes = result.transformed[0];
-      const output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 function toSourceFile(sourceCode: string): ts.SourceFile {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 
 export async function transform(
-  code: ts.SourceFile,
-  classData: any
+	code: ts.SourceFile,
+	classData: any
 ): Promise<string> {
-  const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
 
-  if (!classData.functions) {
-    throw new Error("Input is invalid");
-  }
+	if (!classData.functions) {
+		throw new Error('Input is invalid');
+	}
 
-  if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
-    throw new Error("Code is invalid");
-  }
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
 
-  code = cloneDeep(code);
+	code = cloneDeep(code);
 
-  // import related
-  classData.clients = Array.from(
-    new Set(classData.functions.map(method => method.client))
-  );
-  const importStatments: any = new Array(classData.clients.length);
-  importStatments.fill(Object.assign({}, code.statements[0]));
-  code.statements = importStatments.concat(code.statements.slice(1));
-  // import related
+	// import related
+	classData.clients = Array.from(
+		new Set(classData.functions.map(method => method.client))
+	);
+	const importStatments: any = new Array(classData.clients.length);
+	importStatments.fill(Object.assign({}, code.statements[0]));
+	code.statements = importStatments.concat(code.statements.slice(1));
+	// import related
 
-  const addFunctions = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        let functions: any = [];
-        classData.functions.map(method => {
-          const clonedNode = Object.assign({}, node.members[1]);
-          clonedNode.name = ts.createIdentifier(method.functionName);
-          functions.push(clonedNode);
-        });
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				classData.functions.map(method => {
+					const clonedNode = Object.assign({}, node.members[1]);
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
 
-        const updatedClass = ts.updateClassDeclaration(
-          node,
-          node.decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          ts.createNodeArray([node.members[0]].concat(functions))
-        );
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
 
-        return updatedClass;
-      }
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const addIdentifiers = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-    let clientCount = 0;
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isMethodDeclaration(node)) {
-        const parameters = classData.functions[count].params.map(param => {
-          const paramNode = ts.createParameter(
-            undefined,
-            undefined,
-            undefined,
-            param.name
-          );
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		let clientCount = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						const paramNode = ts.createParameter(
+							undefined,
+							undefined,
+							undefined,
+							param.name
+						);
 
-          if (param.optional) {
-            paramNode.initializer = ts.createIdentifier("undefined");
-          }
+						if (param.optional) {
+							paramNode.initializer = ts.createIdentifier(
+								'undefined'
+							);
+						}
 
-          return paramNode;
-        });
+						return paramNode;
+					}
+				);
 
-        node.parameters = parameters;
-      }
+				node.parameters = parameters;
+			}
 
-      if (ts.isStringLiteral(node) && node.text === "pkgName") {
-        return ts.createStringLiteral(
-          "@azure/" + classData.functions[0].pkgName
-        );
-      }
+			if (ts.isStringLiteral(node) && node.text === 'pkgName') {
+				return ts.createStringLiteral(
+					'@azure/' + classData.functions[0].pkgName
+				);
+			}
 
-      if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
-        let updatedIdentifier;
-        switch (node.text) {
-          case "ClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("Azure_" + classData.serviceName)
-            );
-            break;
-          case "SDKClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                classData.functions[count].fileName.split(".")[0]
-              )
-            );
-            break;
-          case "functionClient":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.functions[count].client)
-            );
-            break;
-          case "ClientName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.clients[clientCount])
-            );
-            clientCount++;
-            break;
-          case "SDKFunctionName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.functions[count].SDKFunctionName)
-            );
-            count++;
-        }
-        return updatedIdentifier;
-      }
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'Azure_' + classData.serviceName
+							)
+						);
+						break;
+					case 'SDKClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].fileName.split(
+									'.'
+								)[0]
+							)
+						);
+						break;
+					case 'functionClient':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].client
+							)
+						);
+						break;
+					case 'ClientName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(classData.clients[clientCount])
+						);
+						clientCount++;
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+				}
+				return updatedIdentifier;
+			}
 
-      if (ts.isCallExpression(node)) {
-        node.expression.forEachChild(childNode => {
-          if (
-            ts.isIdentifier(childNode) &&
-            childNode.text === "SDKFunctionName"
-          ) {
-            const args = classData.functions[count].params.map(param =>
-              ts.createIdentifier(param.name)
-            );
-            node.arguments = args;
-          }
-        });
-      }
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = classData.functions[count].params.map(
+							param => ts.createIdentifier(param.name)
+						);
+						node.arguments = args;
+					}
+				});
+			}
 
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const addComments = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
 
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        addMultiLineComment(
-          node,
-          "This is an auto generated class, please do not change."
-        );
-        const comment = `*
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
  * Class to create a ${classData.serviceName} object
  * @category Azure
  `;
-        addMultiLineComment(node, comment);
-      }
+				addMultiLineComment(node, comment);
+			}
 
-      if (ts.isMethodDeclaration(node)) {
-        let parameters = classData.functions[count].params.map(param => {
-          let statment;
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						let statment;
 
-          if (param.optional) {
-            statment = `* @param {${param.type}} [${param.name}] - Optional parameter`;
-          } else {
-            statment = `* @param {${param.type}} ${param.name} - Mandatory parameter`;
-          }
-          return statment;
-        });
+						if (param.optional) {
+							statment = `* @param {${param.type}} [${param.name}] - Optional parameter`;
+						} else {
+							statment = `* @param {${param.type}} ${param.name} - Mandatory parameter`;
+						}
+						return statment;
+					}
+				);
 
-        let comment;
-        if (parameters.length > 0) {
-          let paramStatments: string = "";
-          parameters.map(param => {
-            paramStatments = paramStatments.concat(
-              paramStatments === "" ? `${param}` : `\n ${param}`
-            );
-          });
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n ${param}`
+						);
+					});
 
-          comment = `*
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${
-            classData.functions[0].pkgName.split("-")[1]
-          }
+						classData.functions[0].pkgName.split('-')[1]
+					}
  ${paramStatments}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        } else {
-          comment = `*
+				} else {
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${
-            classData.functions[0].pkgName.split("-")[1]
-          }
+						classData.functions[0].pkgName.split('-')[1]
+					}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        }
+				}
 
-        addMultiLineComment(node, comment);
-        count++;
-      }
+				addMultiLineComment(node, comment);
+				count++;
+			}
 
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const result_1 = await runTransformation(code, addFunctions);
-  const result_2 = await runTransformation(
-    toSourceFile(result_1),
-    addIdentifiers
-  );
-  const result_3 = await runTransformation(toSourceFile(result_2), addComments);
-  return result_3;
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
 }
diff --git a/generator/transformers/do/transformer.js b/generator/transformers/do/transformer.js
index 81a0bc68..30e4c2fb 100644
--- a/generator/transformers/do/transformer.js
+++ b/generator/transformers/do/transformer.js
@@ -1,433 +1,480 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.transform = void 0;
-var ts = require("typescript");
-var lodash_1 = require("lodash");
+var lodash_1 = require('lodash');
+var ts = require('typescript');
 var dummyIdentifiers = [
-  "ClassName",
-  "_sdkClassName",
-  "SDKClassName",
-  "SDKFunctionName"
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
 ];
 var printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 function addMultiLineComment(node, comment) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 function runTransformation(sourceCode, transformMethod) {
-  return new Promise(function(resolve, reject) {
-    try {
-      var result = ts.transform(sourceCode, [transformMethod]);
-      var transformedNodes = result.transformed[0];
-      var output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 function toSourceFile(sourceCode) {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 /*
  * The Transform function to be called from generator
  */
 function transform(code, classData) {
-  return __awaiter(this, void 0, void 0, function() {
-    var addFunctions,
-      addIdentifiers,
-      addComments,
-      node,
-      result_1,
-      result_2,
-      result_3;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          addFunctions = function(context) {
-            return function(rootNode) {
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  var functions_1 = [];
-                  classData.functions.map(function(method) {
-                    var clonedNode = Object.assign({}, node.members[1]);
-                    // console.log("Cloned Node..........\n");//sdadas
-                    // console.log(clonedNode);//asdasdasdasd
-                    clonedNode.name = ts.createIdentifier(method.functionName);
-                    functions_1.push(clonedNode);
-                  });
-                  var updatedClass = ts.updateClassDeclaration(
-                    node,
-                    node.decorators,
-                    node.modifiers,
-                    node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
-                    ts.createNodeArray([node.members[0]].concat(functions_1))
-                  );
-                  return updatedClass;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addIdentifiers = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var paramNode = ts.createParameter(
-                        undefined,
-                        undefined,
-                        undefined,
-                        param.name
-                      );
-                      if (param.optional) {
-                        paramNode.initializer = ts.createIdentifier(
-                          "undefined"
-                        );
-                      }
-                      return paramNode;
-                    }
-                  );
-                  node.parameters = parameters;
-                }
-                if (
-                  ts.isIdentifier(node) &&
-                  dummyIdentifiers.includes(node.text)
-                ) {
-                  var updatedIdentifier = void 0;
-                  switch (node.text) {
-                    case "ClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("DO_" + classData.serviceName)
-                      );
-                      break;
-                    case "_sdkClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          "_" +
-                            classData.className.charAt(0).toLowerCase() +
-                            classData.className.substr(1)
-                        )
-                      );
-                      break;
-                    case "SDKClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.className.charAt(0).toLowerCase() +
-                            classData.className.substr(1)
-                        )
-                      );
-                      break;
-                    case "SDKFunctionName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.functions[count].SDKFunctionName
-                        )
-                      );
-                      count++;
-                  }
-                  return updatedIdentifier;
-                }
-                if (ts.isCallExpression(node)) {
-                  node.expression.forEachChild(function(childNode) {
-                    if (
-                      ts.isIdentifier(childNode) &&
-                      childNode.text === "SDKFunctionName"
-                    ) {
-                      var args = classData.functions[count].params.map(function(
-                        param
-                      ) {
-                        return ts.createIdentifier(param.name);
-                      });
-                      node.arguments = args.concat(node.arguments);
-                    }
-                  });
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addComments = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  addMultiLineComment(
-                    node,
-                    "This is an auto generated class, please do not change."
-                  );
-                  var comment =
-                    "*\n* Class to create a " +
-                    classData.className +
-                    " object\n* @category Digital Ocean       \n";
-                  addMultiLineComment(node, comment);
-                }
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var statment;
-                      if (param.optional) {
-                        if (param.type == "TypeReference")
-                          statment =
-                            "* @param {" +
-                            param.typeName +
-                            "} " +
-                            param.name +
-                            " - Data required for " +
-                            classData.functions[count].SDKFunctionName;
-                        else
-                          statment =
-                            "* @param {" +
-                            param.type +
-                            "} " +
-                            param.name +
-                            " - Data required for " +
-                            classData.functions[count].SDKFunctionName;
-                      } else {
-                        if (param.type == "TypeReference")
-                          statment =
-                            "* @param {" +
-                            param.typeName +
-                            "} " +
-                            param.name +
-                            " - Data required for " +
-                            classData.functions[count].SDKFunctionName;
-                        else
-                          statment =
-                            "* @param {" +
-                            param.type +
-                            "} " +
-                            param.name +
-                            " - Data required for " +
-                            classData.functions[count].SDKFunctionName;
-                      }
-                      return statment;
-                    }
-                  );
-                  var comment = void 0;
-                  if (parameters.length > 0) {
-                    var paramStatments_1 = "";
-                    parameters.map(function(param) {
-                      paramStatments_1 = paramStatments_1.concat(
-                        paramStatments_1 === "" ? "" + param : "\n" + param
-                      );
-                    });
-                    comment =
-                      "*\n* Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.className +
-                      "\n" +
-                      paramStatments_1 +
-                      "\n* @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n";
-                  } else {
-                    comment =
-                      "*\n* Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.className +
-                      "\n* @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n";
-                  }
-                  addMultiLineComment(node, comment);
-                  count++;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          node = code.statements.find(function(stm) {
-            return ts.isClassDeclaration(stm);
-          });
-          if (!classData.className || !classData.functions) {
-            throw new Error("Input is invalid");
-          }
-          if (
-            !node ||
-            !node.members.some(function(member) {
-              return ts.isMethodDeclaration(member);
-            })
-          ) {
-            throw new Error("Code is invalid");
-          }
-          code = lodash_1.cloneDeep(code);
-          return [4 /*yield*/, runTransformation(code, addFunctions)];
-        case 1:
-          result_1 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_1), addIdentifiers)
-          ];
-        case 2:
-          result_2 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_2), addComments)
-          ];
-        case 3:
-          result_3 = _a.sent();
-          return [2 /*return*/, result_3];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var addFunctions,
+			addIdentifiers,
+			addComments,
+			node,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									classData.functions.map(function(method) {
+										var clonedNode = Object.assign(
+											{},
+											node.members[1]
+										);
+										// console.log("Cloned Node..........\n");//sdadas
+										// console.log(clonedNode);//asdasdasdasd
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters;
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'DO_' +
+														classData.serviceName
+												)
+											);
+											break;
+										case '_sdkClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														classData.className
+															.charAt(0)
+															.toLowerCase() +
+														classData.className.substr(
+															1
+														)
+												)
+											);
+											break;
+										case 'SDKClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.className
+														.charAt(0)
+														.toLowerCase() +
+														classData.className.substr(
+															1
+														)
+												)
+											);
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = classData.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args.concat(
+												node.arguments
+											);
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n* Class to create a ' +
+										classData.className +
+										' object\n* @category Digital Ocean       \n';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var statment;
+										if (param.optional) {
+											if (param.type == 'TypeReference')
+												statment =
+													'* @param {' +
+													param.typeName +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+											else
+												statment =
+													'* @param {' +
+													param.type +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+										} else {
+											if (param.type == 'TypeReference')
+												statment =
+													'* @param {' +
+													param.typeName +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+											else
+												statment =
+													'* @param {' +
+													param.type +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n' + param
+											);
+										});
+										comment =
+											'*\n* Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n' +
+											paramStatments_1 +
+											'\n* @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n';
+									} else {
+										comment =
+											'*\n* Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n* @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!classData.className || !classData.functions) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
 }
 exports.transform = transform;
diff --git a/generator/transformers/do/transformer.ts b/generator/transformers/do/transformer.ts
index 3f063962..115ed946 100644
--- a/generator/transformers/do/transformer.ts
+++ b/generator/transformers/do/transformer.ts
@@ -1,51 +1,51 @@
-import { cloneDeep } from "lodash";
-import * as ts from "typescript";
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
 
 const dummyIdentifiers = [
-  "ClassName",
-  "_sdkClassName",
-  "SDKClassName",
-  "SDKFunctionName"
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
 ];
 
 const printer: ts.Printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 
 function addMultiLineComment(node, comment: string) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 
 function runTransformation(sourceCode, transformMethod): Promise<string> {
-  return new Promise((resolve, reject) => {
-    try {
-      const result = ts.transform(sourceCode, [transformMethod]);
-      const transformedNodes = result.transformed[0];
-      const output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 function toSourceFile(sourceCode: string): ts.SourceFile {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 
 /*
@@ -53,215 +53,228 @@ function toSourceFile(sourceCode: string): ts.SourceFile {
  */
 
 export async function transform(
-  code: ts.SourceFile,
-  classData: any
+	code: ts.SourceFile,
+	classData: any
 ): Promise<string> {
-  /*
-   * Transformation function for adding Functions
-   */
-  const addFunctions = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        let functions: any = [];
-        classData.functions.map(method => {
-          const clonedNode = Object.assign({}, node.members[1]);
-          // console.log("Cloned Node..........\n");//sdadas
-          // console.log(clonedNode);//asdasdasdasd
-          clonedNode.name = ts.createIdentifier(method.functionName);
-          functions.push(clonedNode);
-        });
-
-        const updatedClass = ts.updateClassDeclaration(
-          node,
-          node.decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          ts.createNodeArray([node.members[0]].concat(functions))
-        );
-
-        return updatedClass;
-      }
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  /*
-   *  Transformation function for adding Identifiers/Parameters
-   */
-  const addIdentifiers = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isMethodDeclaration(node)) {
-        const parameters = classData.functions[count].params.map(param => {
-          const paramNode = ts.createParameter(
-            undefined,
-            undefined,
-            undefined,
-            param.name
-          );
-
-          if (param.optional) {
-            paramNode.initializer = ts.createIdentifier("undefined");
-          }
-
-          return paramNode;
-        });
-
-        node.parameters = parameters;
-      }
-
-      if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
-        let updatedIdentifier;
-
-        switch (node.text) {
-          case "ClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("DO_" + classData.serviceName)
-            );
-            break;
-          case "_sdkClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                "_" +
-                  classData.className.charAt(0).toLowerCase() +
-                  classData.className.substr(1)
-              )
-            );
-            break;
-          case "SDKClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                classData.className.charAt(0).toLowerCase() +
-                  classData.className.substr(1)
-              )
-            );
-            break;
-          case "SDKFunctionName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.functions[count].SDKFunctionName)
-            );
-            count++;
-        }
-
-        return updatedIdentifier;
-      }
-
-      if (ts.isCallExpression(node)) {
-        node.expression.forEachChild(childNode => {
-          if (
-            ts.isIdentifier(childNode) &&
-            childNode.text === "SDKFunctionName"
-          ) {
-            const args = classData.functions[count].params.map(param =>
-              ts.createIdentifier(param.name)
-            );
-            node.arguments = args.concat(node.arguments);
-          }
-        });
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  /*
-   *Transformation function for adding comments
-   */
-
-  const addComments = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        addMultiLineComment(
-          node,
-          "This is an auto generated class, please do not change."
-        );
-        const comment = `*
+	/*
+	 * Transformation function for adding Functions
+	 */
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				classData.functions.map(method => {
+					const clonedNode = Object.assign({}, node.members[1]);
+					// console.log("Cloned Node..........\n");//sdadas
+					// console.log(clonedNode);//asdasdasdasd
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
+
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
+
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 *  Transformation function for adding Identifiers/Parameters
+	 */
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						const paramNode = ts.createParameter(
+							undefined,
+							undefined,
+							undefined,
+							param.name
+						);
+
+						if (param.optional) {
+							paramNode.initializer = ts.createIdentifier(
+								'undefined'
+							);
+						}
+
+						return paramNode;
+					}
+				);
+
+				node.parameters = parameters;
+			}
+
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier('DO_' + classData.serviceName)
+						);
+						break;
+					case '_sdkClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' +
+									classData.className
+										.charAt(0)
+										.toLowerCase() +
+									classData.className.substr(1)
+							)
+						);
+						break;
+					case 'SDKClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.className.charAt(0).toLowerCase() +
+									classData.className.substr(1)
+							)
+						);
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+				}
+
+				return updatedIdentifier;
+			}
+
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = classData.functions[count].params.map(
+							param => ts.createIdentifier(param.name)
+						);
+						node.arguments = args.concat(node.arguments);
+					}
+				});
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 *Transformation function for adding comments
+	 */
+
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
 * Class to create a ${classData.className} object
 * @category Digital Ocean       
 `;
-        addMultiLineComment(node, comment);
-      }
-
-      if (ts.isMethodDeclaration(node)) {
-        let parameters = classData.functions[count].params.map(param => {
-          let statment;
-
-          if (param.optional) {
-            if (param.type == "TypeReference")
-              statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-            else
-              statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-          } else {
-            if (param.type == "TypeReference")
-              statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-            else
-              statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-          }
-          return statment;
-        });
-
-        let comment;
-        if (parameters.length > 0) {
-          let paramStatments: string = "";
-          parameters.map(param => {
-            paramStatments = paramStatments.concat(
-              paramStatments === "" ? `${param}` : `\n${param}`
-            );
-          });
-
-          comment = `*
+				addMultiLineComment(node, comment);
+			}
+
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						let statment;
+
+						if (param.optional) {
+							if (param.type == 'TypeReference')
+								statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+							else
+								statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						} else {
+							if (param.type == 'TypeReference')
+								statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+							else
+								statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						}
+						return statment;
+					}
+				);
+
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n${param}`
+						);
+					});
+
+					comment = `*
 * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
 ${paramStatments}
 * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
 `;
-        } else {
-          comment = `*
+				} else {
+					comment = `*
 * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
 * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
 `;
-        }
-
-        addMultiLineComment(node, comment);
-        count++;
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  /*
-   * Code to get node and run tranformations
-   */
-  const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
-
-  if (!classData.className || !classData.functions) {
-    throw new Error("Input is invalid");
-  }
-
-  if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
-    throw new Error("Code is invalid");
-  }
-
-  code = cloneDeep(code);
-
-  const result_1 = await runTransformation(code, addFunctions);
-  const result_2 = await runTransformation(
-    toSourceFile(result_1),
-    addIdentifiers
-  );
-  const result_3 = await runTransformation(toSourceFile(result_2), addComments);
-  return result_3;
+				}
+
+				addMultiLineComment(node, comment);
+				count++;
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 * Code to get node and run tranformations
+	 */
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+
+	if (!classData.className || !classData.functions) {
+		throw new Error('Input is invalid');
+	}
+
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
+
+	code = cloneDeep(code);
+
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
 }
diff --git a/generator/transformers/googleCloud/classBasedTransformer.js b/generator/transformers/googleCloud/classBasedTransformer.js
index a92ac78b..48c30b18 100644
--- a/generator/transformers/googleCloud/classBasedTransformer.js
+++ b/generator/transformers/googleCloud/classBasedTransformer.js
@@ -1,477 +1,553 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.classBasedTransform = void 0;
-var ts = require("typescript");
-var lodash_1 = require("lodash");
+var lodash_1 = require('lodash');
+var ts = require('typescript');
 var dummyIdentifiers = [
-  "ClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "_client",
-  "_clientObj",
-  "Client",
-  "_className"
+	'ClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'_client',
+	'_clientObj',
+	'Client',
+	'_className',
 ];
 var printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 function addMultiLineComment(node, comment) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 function runTransformation(sourceCode, transformMethod) {
-  return new Promise(function(resolve, reject) {
-    try {
-      var result = ts.transform(sourceCode, [transformMethod]);
-      var transformedNodes = result.transformed[0];
-      var output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 function toSourceFile(sourceCode) {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 function classBasedTransform(code, data) {
-  return __awaiter(this, void 0, void 0, function() {
-    var node,
-      addFunctions,
-      addIdentifiers,
-      addComments,
-      result_1,
-      result_2,
-      result_3;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          node = code.statements.find(function(stm) {
-            return ts.isClassDeclaration(stm);
-          });
-          if (!data.functions || !data.classData) {
-            throw new Error("Input is invalid");
-          }
-          if (
-            !node ||
-            !node.members.some(function(member) {
-              return ts.isMethodDeclaration(member);
-            })
-          ) {
-            throw new Error("Code is invalid");
-          }
-          code = lodash_1.cloneDeep(code);
-          addFunctions = function(context) {
-            return function(rootNode) {
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  var functions_1 = [];
-                  data.functions.map(function(method) {
-                    var clonedNode;
-                    if (method.returnTypeName === "Promise") {
-                      if (
-                        (method.classConstructorData.parameters[0].type =
-                          "TypeReference" &&
-                          !method.classConstructorData.parameters[0].optional)
-                      ) {
-                        clonedNode = Object.assign({}, node.members[3]);
-                      } else {
-                        clonedNode = Object.assign({}, node.members[1]);
-                      }
-                    } else {
-                      clonedNode = Object.assign({}, node.members[2]);
-                    }
-                    clonedNode.name = ts.createIdentifier(method.functionName);
-                    functions_1.push(clonedNode);
-                  });
-                  var updatedClass = ts.updateClassDeclaration(
-                    node,
-                    node.decorators,
-                    node.modifiers,
-                    node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
-                    ts.createNodeArray([node.members[0]].concat(functions_1))
-                  );
-                  return updatedClass;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addIdentifiers = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isMethodDeclaration(node)) {
-                  data.functions[count].allParams = [];
-                  var params = [];
-                  if (
-                    (data.functions[
-                      count
-                    ].classConstructorData.parameters[0].type =
-                      "TypeReference" &&
-                      !data.functions[count].classConstructorData.parameters[0]
-                        .optional)
-                  ) {
-                    params.push(
-                      data.functions[count].classConstructorData.parameters[0]
-                    );
-                    data.functions[count].allParams.push({
-                      name: "identifier",
-                      optional: true,
-                      type: "string"
-                    });
-                  }
-                  params = params.concat(data.functions[count].params);
-                  data.functions[count].allParams = data.functions[
-                    count
-                  ].allParams.concat(params);
-                  var parameters = params.map(function(param) {
-                    var paramNode = ts.createParameter(
-                      undefined,
-                      undefined,
-                      undefined,
-                      param.name
-                    );
-                    if (param.optional) {
-                      paramNode.initializer = ts.createIdentifier("undefined");
-                    }
-                    return paramNode;
-                  });
-                  node.parameters = parameters.concat(node.parameters);
-                }
-                if (ts.isStringLiteral(node) && node.text === "pkgName") {
-                  return ts.createStringLiteral(
-                    "@google-cloud/" + data.functions[0].pkgName
-                  );
-                }
-                if (
-                  ts.isIdentifier(node) &&
-                  dummyIdentifiers.includes(node.text)
-                ) {
-                  var updatedIdentifier = void 0;
-                  switch (node.text) {
-                    case "ClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("GCP_" + data.functions[0].pkgName)
-                      );
-                      break;
-                    case "ClientName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(data.mainClass)
-                      );
-                      break;
-                    case "SDKFunctionName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          data.functions[count].SDKFunctionName
-                        )
-                      );
-                      count++;
-                      break;
-                    case "_className":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          data.functions[count].client.toLowerCase()
-                        )
-                      );
-                      break;
-                    case "_client":
-                      if (
-                        (data.functions[
-                          count
-                        ].classConstructorData.parameters[0].type =
-                          "TypeReference" &&
-                          !data.functions[count].classConstructorData
-                            .parameters[0].optional)
-                      ) {
-                        updatedIdentifier = ts.updateIdentifier(
-                          ts.createIdentifier(
-                            data.functions[count].classConstructorData
-                              .parameters[0].name
-                          )
-                        );
-                      } else {
-                        updatedIdentifier = ts.updateIdentifier(
-                          ts.createIdentifier(
-                            "_" + data.mainClass.toLowerCase()
-                          )
-                        );
-                      }
-                      break;
-                    case "_clientObj":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("_" + data.mainClass.toLowerCase())
-                      );
-                      break;
-                    case "Client":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(data.mainClass)
-                      );
-                      break;
-                  }
-                  return updatedIdentifier;
-                }
-                if (ts.isCallExpression(node)) {
-                  node.expression.forEachChild(function(childNode) {
-                    if (
-                      ts.isIdentifier(childNode) &&
-                      childNode.text === "SDKFunctionName"
-                    ) {
-                      var args = data.functions[count].params.map(function(
-                        param
-                      ) {
-                        return ts.createIdentifier(param.name);
-                      });
-                      node.arguments = args;
-                    }
-                  });
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addComments = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  addMultiLineComment(
-                    node,
-                    "This is an auto generated class, please do not change."
-                  );
-                  var comment =
-                    "*\n * Class to create a " +
-                    data.functions[0].pkgName +
-                    " object\n * @category Google Cloud\n ";
-                  addMultiLineComment(node, comment);
-                }
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = data.functions[count].allParams.map(function(
-                    param
-                  ) {
-                    var statment;
-                    if (param.optional) {
-                      statment =
-                        "* @param {" +
-                        (param.typeRefName ? param.typeRefName : param.type) +
-                        "} [" +
-                        param.name +
-                        "] - Optional parameter";
-                    } else {
-                      statment =
-                        "* @param {" +
-                        (param.typeRefName ? param.typeRefName : param.type) +
-                        "} " +
-                        param.name +
-                        " - Mandatory parameter";
-                    }
-                    return statment;
-                  });
-                  var comment = void 0;
-                  if (parameters.length > 0) {
-                    var paramStatments_1 = "";
-                    parameters.map(function(param) {
-                      paramStatments_1 = paramStatments_1.concat(
-                        paramStatments_1 === "" ? "" + param : "\n " + param
-                      );
-                    });
-                    comment =
-                      "*\n * Trigers the " +
-                      data.functions[count].SDKFunctionName +
-                      " function of " +
-                      data.functions[0].pkgName +
-                      "\n " +
-                      paramStatments_1 +
-                      "\n * @returns {Promise<" +
-                      data.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  } else {
-                    comment =
-                      "*\n * Trigers the " +
-                      data.functions[count].SDKFunctionName +
-                      " function of " +
-                      data.functions[0].pkgName +
-                      "\n * @returns {Promise<" +
-                      data.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  }
-                  addMultiLineComment(node, comment);
-                  count++;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          return [4 /*yield*/, runTransformation(code, addFunctions)];
-        case 1:
-          result_1 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_1), addIdentifiers)
-          ];
-        case 2:
-          result_2 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_2), addComments)
-          ];
-        case 3:
-          result_3 = _a.sent();
-          return [2 /*return*/, result_3];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var node,
+			addFunctions,
+			addIdentifiers,
+			addComments,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!data.functions || !data.classData) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									data.functions.map(function(method) {
+										var clonedNode;
+										if (
+											method.returnTypeName === 'Promise'
+										) {
+											if (
+												(method.classConstructorData.parameters[0].type =
+													'TypeReference' &&
+													!method.classConstructorData
+														.parameters[0].optional)
+											) {
+												clonedNode = Object.assign(
+													{},
+													node.members[3]
+												);
+											} else {
+												clonedNode = Object.assign(
+													{},
+													node.members[1]
+												);
+											}
+										} else {
+											clonedNode = Object.assign(
+												{},
+												node.members[2]
+											);
+										}
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									data.functions[count].allParams = [];
+									var params = [];
+									if (
+										(data.functions[
+											count
+										].classConstructorData.parameters[0].type =
+											'TypeReference' &&
+											!data.functions[count]
+												.classConstructorData
+												.parameters[0].optional)
+									) {
+										params.push(
+											data.functions[count]
+												.classConstructorData
+												.parameters[0]
+										);
+										data.functions[count].allParams.push({
+											name: 'identifier',
+											optional: true,
+											type: 'string',
+										});
+									}
+									params = params.concat(
+										data.functions[count].params
+									);
+									data.functions[
+										count
+									].allParams = data.functions[
+										count
+									].allParams.concat(params);
+									var parameters = params.map(function(
+										param
+									) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters.concat(
+										node.parameters
+									);
+								}
+								if (
+									ts.isStringLiteral(node) &&
+									node.text === 'pkgName'
+								) {
+									return ts.createStringLiteral(
+										'@google-cloud/' +
+											data.functions[0].pkgName
+									);
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'GCP_' +
+														data.functions[0]
+															.pkgName
+												)
+											);
+											break;
+										case 'ClientName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													data.mainClass
+												)
+											);
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													data.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+											break;
+										case '_className':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													data.functions[
+														count
+													].client.toLowerCase()
+												)
+											);
+											break;
+										case '_client':
+											if (
+												(data.functions[
+													count
+												].classConstructorData.parameters[0].type =
+													'TypeReference' &&
+													!data.functions[count]
+														.classConstructorData
+														.parameters[0].optional)
+											) {
+												updatedIdentifier = ts.updateIdentifier(
+													ts.createIdentifier(
+														data.functions[count]
+															.classConstructorData
+															.parameters[0].name
+													)
+												);
+											} else {
+												updatedIdentifier = ts.updateIdentifier(
+													ts.createIdentifier(
+														'_' +
+															data.mainClass.toLowerCase()
+													)
+												);
+											}
+											break;
+										case '_clientObj':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														data.mainClass.toLowerCase()
+												)
+											);
+											break;
+										case 'Client':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													data.mainClass
+												)
+											);
+											break;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = data.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args;
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n * Class to create a ' +
+										data.functions[0].pkgName +
+										' object\n * @category Google Cloud\n ';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = data.functions[
+										count
+									].allParams.map(function(param) {
+										var statment;
+										if (param.optional) {
+											statment =
+												'* @param {' +
+												(param.typeRefName
+													? param.typeRefName
+													: param.type) +
+												'} [' +
+												param.name +
+												'] - Optional parameter';
+										} else {
+											statment =
+												'* @param {' +
+												(param.typeRefName
+													? param.typeRefName
+													: param.type) +
+												'} ' +
+												param.name +
+												' - Mandatory parameter';
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n ' + param
+											);
+										});
+										comment =
+											'*\n * Trigers the ' +
+											data.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											data.functions[0].pkgName +
+											'\n ' +
+											paramStatments_1 +
+											'\n * @returns {Promise<' +
+											data.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									} else {
+										comment =
+											'*\n * Trigers the ' +
+											data.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											data.functions[0].pkgName +
+											'\n * @returns {Promise<' +
+											data.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
 }
 exports.classBasedTransform = classBasedTransform;
diff --git a/generator/transformers/googleCloud/classBasedTransformer.ts b/generator/transformers/googleCloud/classBasedTransformer.ts
index a68f9365..06f0f729 100644
--- a/generator/transformers/googleCloud/classBasedTransformer.ts
+++ b/generator/transformers/googleCloud/classBasedTransformer.ts
@@ -1,310 +1,340 @@
-import { cloneDeep } from "lodash";
-import * as ts from "typescript";
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
 
 const dummyIdentifiers = [
-  "ClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "_client",
-  "_clientObj",
-  "Client",
-  "_className"
+	'ClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'_client',
+	'_clientObj',
+	'Client',
+	'_className',
 ];
 
 const printer: ts.Printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 
 function addMultiLineComment(node, comment: string) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 
 function runTransformation(sourceCode, transformMethod): Promise<string> {
-  return new Promise((resolve, reject) => {
-    try {
-      const result = ts.transform(sourceCode, [transformMethod]);
-      const transformedNodes = result.transformed[0];
-      const output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 function toSourceFile(sourceCode: string): ts.SourceFile {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 
 export async function classBasedTransform(
-  code: ts.SourceFile,
-  data: any
+	code: ts.SourceFile,
+	data: any
 ): Promise<string> {
-  const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
-
-  if (!data.functions || !data.classData) {
-    throw new Error("Input is invalid");
-  }
-
-  if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
-    throw new Error("Code is invalid");
-  }
-
-  code = cloneDeep(code);
-
-  const addFunctions = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        let functions: any = [];
-        data.functions.map(method => {
-          let clonedNode;
-          if (method.returnTypeName === "Promise") {
-            if (
-              (method.classConstructorData.parameters[0].type =
-                "TypeReference" &&
-                !method.classConstructorData.parameters[0].optional)
-            ) {
-              clonedNode = Object.assign({}, node.members[3]);
-            } else {
-              clonedNode = Object.assign({}, node.members[1]);
-            }
-          } else {
-            clonedNode = Object.assign({}, node.members[2]);
-          }
-          clonedNode.name = ts.createIdentifier(method.functionName);
-          functions.push(clonedNode);
-        });
-
-        const updatedClass = ts.updateClassDeclaration(
-          node,
-          node.decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          ts.createNodeArray([node.members[0]].concat(functions))
-        );
-
-        return updatedClass;
-      }
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const addIdentifiers = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isMethodDeclaration(node)) {
-        data.functions[count].allParams = [];
-
-        let params = [];
-        if (
-          (data.functions[count].classConstructorData.parameters[0].type =
-            "TypeReference" &&
-            !data.functions[count].classConstructorData.parameters[0].optional)
-        ) {
-          params.push(data.functions[count].classConstructorData.parameters[0]);
-
-          data.functions[count].allParams.push({
-            name: "identifier",
-            optional: true,
-            type: "string"
-          });
-        }
-
-        params = params.concat(data.functions[count].params);
-        data.functions[count].allParams = data.functions[
-          count
-        ].allParams.concat(params);
-
-        const parameters: any = params.map(param => {
-          const paramNode = ts.createParameter(
-            undefined,
-            undefined,
-            undefined,
-            param.name
-          );
-
-          if (param.optional) {
-            paramNode.initializer = ts.createIdentifier("undefined");
-          }
-
-          return paramNode;
-        });
-
-        node.parameters = parameters.concat(node.parameters);
-      }
-
-      if (ts.isStringLiteral(node) && node.text === "pkgName") {
-        return ts.createStringLiteral(
-          "@google-cloud/" + data.functions[0].pkgName
-        );
-      }
-
-      if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
-        let updatedIdentifier;
-        switch (node.text) {
-          case "ClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("GCP_" + data.functions[0].pkgName)
-            );
-            break;
-          case "ClientName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(data.mainClass)
-            );
-            break;
-          case "SDKFunctionName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(data.functions[count].SDKFunctionName)
-            );
-            count++;
-            break;
-          case "_className":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(data.functions[count].client.toLowerCase())
-            );
-            break;
-          case "_client":
-            if (
-              (data.functions[count].classConstructorData.parameters[0].type =
-                "TypeReference" &&
-                !data.functions[count].classConstructorData.parameters[0]
-                  .optional)
-            ) {
-              updatedIdentifier = ts.updateIdentifier(
-                ts.createIdentifier(
-                  data.functions[count].classConstructorData.parameters[0].name
-                )
-              );
-            } else {
-              updatedIdentifier = ts.updateIdentifier(
-                ts.createIdentifier("_" + data.mainClass.toLowerCase())
-              );
-            }
-            break;
-          case "_clientObj":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("_" + data.mainClass.toLowerCase())
-            );
-            break;
-          case "Client":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(data.mainClass)
-            );
-            break;
-        }
-        return updatedIdentifier;
-      }
-
-      if (ts.isCallExpression(node)) {
-        node.expression.forEachChild(childNode => {
-          if (
-            ts.isIdentifier(childNode) &&
-            childNode.text === "SDKFunctionName"
-          ) {
-            const args = data.functions[count].params.map(param =>
-              ts.createIdentifier(param.name)
-            );
-            node.arguments = args;
-          }
-        });
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const addComments = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        addMultiLineComment(
-          node,
-          "This is an auto generated class, please do not change."
-        );
-        const comment = `*
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+
+	if (!data.functions || !data.classData) {
+		throw new Error('Input is invalid');
+	}
+
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
+
+	code = cloneDeep(code);
+
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				data.functions.map(method => {
+					let clonedNode;
+					if (method.returnTypeName === 'Promise') {
+						if (
+							(method.classConstructorData.parameters[0].type =
+								'TypeReference' &&
+								!method.classConstructorData.parameters[0]
+									.optional)
+						) {
+							clonedNode = Object.assign({}, node.members[3]);
+						} else {
+							clonedNode = Object.assign({}, node.members[1]);
+						}
+					} else {
+						clonedNode = Object.assign({}, node.members[2]);
+					}
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
+
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
+
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				data.functions[count].allParams = [];
+
+				let params = [];
+				if (
+					(data.functions[
+						count
+					].classConstructorData.parameters[0].type =
+						'TypeReference' &&
+						!data.functions[count].classConstructorData
+							.parameters[0].optional)
+				) {
+					params.push(
+						data.functions[count].classConstructorData.parameters[0]
+					);
+
+					data.functions[count].allParams.push({
+						name: 'identifier',
+						optional: true,
+						type: 'string',
+					});
+				}
+
+				params = params.concat(data.functions[count].params);
+				data.functions[count].allParams = data.functions[
+					count
+				].allParams.concat(params);
+
+				const parameters: any = params.map(param => {
+					const paramNode = ts.createParameter(
+						undefined,
+						undefined,
+						undefined,
+						param.name
+					);
+
+					if (param.optional) {
+						paramNode.initializer = ts.createIdentifier(
+							'undefined'
+						);
+					}
+
+					return paramNode;
+				});
+
+				node.parameters = parameters.concat(node.parameters);
+			}
+
+			if (ts.isStringLiteral(node) && node.text === 'pkgName') {
+				return ts.createStringLiteral(
+					'@google-cloud/' + data.functions[0].pkgName
+				);
+			}
+
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'GCP_' + data.functions[0].pkgName
+							)
+						);
+						break;
+					case 'ClientName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(data.mainClass)
+						);
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								data.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+						break;
+					case '_className':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								data.functions[count].client.toLowerCase()
+							)
+						);
+						break;
+					case '_client':
+						if (
+							(data.functions[
+								count
+							].classConstructorData.parameters[0].type =
+								'TypeReference' &&
+								!data.functions[count].classConstructorData
+									.parameters[0].optional)
+						) {
+							updatedIdentifier = ts.updateIdentifier(
+								ts.createIdentifier(
+									data.functions[count].classConstructorData
+										.parameters[0].name
+								)
+							);
+						} else {
+							updatedIdentifier = ts.updateIdentifier(
+								ts.createIdentifier(
+									'_' + data.mainClass.toLowerCase()
+								)
+							);
+						}
+						break;
+					case '_clientObj':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' + data.mainClass.toLowerCase()
+							)
+						);
+						break;
+					case 'Client':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(data.mainClass)
+						);
+						break;
+				}
+				return updatedIdentifier;
+			}
+
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = data.functions[count].params.map(param =>
+							ts.createIdentifier(param.name)
+						);
+						node.arguments = args;
+					}
+				});
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
  * Class to create a ${data.functions[0].pkgName} object
  * @category Google Cloud
  `;
-        addMultiLineComment(node, comment);
-      }
-
-      if (ts.isMethodDeclaration(node)) {
-        let parameters = data.functions[count].allParams.map(param => {
-          let statment;
-
-          if (param.optional) {
-            statment = `* @param {${
-              param.typeRefName ? param.typeRefName : param.type
-            }} [${param.name}] - Optional parameter`;
-          } else {
-            statment = `* @param {${
-              param.typeRefName ? param.typeRefName : param.type
-            }} ${param.name} - Mandatory parameter`;
-          }
-          return statment;
-        });
-
-        let comment;
-        if (parameters.length > 0) {
-          let paramStatments: string = "";
-          parameters.map(param => {
-            paramStatments = paramStatments.concat(
-              paramStatments === "" ? `${param}` : `\n ${param}`
-            );
-          });
-
-          comment = `*
+				addMultiLineComment(node, comment);
+			}
+
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = data.functions[count].allParams.map(
+					param => {
+						let statment;
+
+						if (param.optional) {
+							statment = `* @param {${
+								param.typeRefName
+									? param.typeRefName
+									: param.type
+							}} [${param.name}] - Optional parameter`;
+						} else {
+							statment = `* @param {${
+								param.typeRefName
+									? param.typeRefName
+									: param.type
+							}} ${param.name} - Mandatory parameter`;
+						}
+						return statment;
+					}
+				);
+
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n ${param}`
+						);
+					});
+
+					comment = `*
  * Trigers the ${data.functions[count].SDKFunctionName} function of ${data.functions[0].pkgName}
  ${paramStatments}
  * @returns {Promise<${data.functions[count].SDKFunctionName}Response>}
  `;
-        } else {
-          comment = `*
+				} else {
+					comment = `*
  * Trigers the ${data.functions[count].SDKFunctionName} function of ${data.functions[0].pkgName}
  * @returns {Promise<${data.functions[count].SDKFunctionName}Response>}
  `;
-        }
-
-        addMultiLineComment(node, comment);
-        count++;
-      }
-
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
-
-  const result_1 = await runTransformation(code, addFunctions);
-  const result_2 = await runTransformation(
-    toSourceFile(result_1),
-    addIdentifiers
-  );
-  const result_3 = await runTransformation(toSourceFile(result_2), addComments);
-  return result_3;
+				}
+
+				addMultiLineComment(node, comment);
+				count++;
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
 }
diff --git a/generator/transformers/googleCloud/clientBasedTransformer.js b/generator/transformers/googleCloud/clientBasedTransformer.js
index 509837e6..715482e2 100644
--- a/generator/transformers/googleCloud/clientBasedTransformer.js
+++ b/generator/transformers/googleCloud/clientBasedTransformer.js
@@ -1,468 +1,536 @@
-"use strict";
+'use strict';
 var __awaiter =
-  (this && this.__awaiter) ||
-  function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function(resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator["throw"](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done
-          ? resolve(result.value)
-          : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
 var __generator =
-  (this && this.__generator) ||
-  function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function() {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: []
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === "function" &&
-        (g[Symbol.iterator] = function() {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function(v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (_)
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t =
-                op[0] & 2
-                  ? y["return"]
-                  : op[0]
-                  ? y["throw"] || ((t = y["return"]) && t.call(y), 0)
-                  : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (
-                !((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-                (op[0] === 6 || op[0] === 2)
-              ) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
 exports.__esModule = true;
 exports.clientBasedTransform = void 0;
-var ts = require("typescript");
-var lodash_1 = require("lodash");
+var lodash_1 = require('lodash');
+var ts = require('typescript');
 var dummyIdentifiers = [
-  "ClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "_client",
-  "_clientObj",
-  "Client"
+	'ClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'_client',
+	'_clientObj',
+	'Client',
 ];
 var printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 function addMultiLineComment(node, comment) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 function runTransformation(sourceCode, transformMethod) {
-  return new Promise(function(resolve, reject) {
-    try {
-      var result = ts.transform(sourceCode, [transformMethod]);
-      var transformedNodes = result.transformed[0];
-      var output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 function toSourceFile(sourceCode) {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 function clientBasedTransform(code, classData) {
-  return __awaiter(this, void 0, void 0, function() {
-    var node,
-      importStatments,
-      classDeclarationNode,
-      constructorNode,
-      clientObjects,
-      addFunctions,
-      addIdentifiers,
-      addComments,
-      result_1,
-      result_2,
-      result_3;
-    return __generator(this, function(_a) {
-      switch (_a.label) {
-        case 0:
-          node = code.statements.find(function(stm) {
-            return ts.isClassDeclaration(stm);
-          });
-          if (!classData.functions) {
-            throw new Error("Input is invalid");
-          }
-          if (
-            !node ||
-            !node.members.some(function(member) {
-              return ts.isMethodDeclaration(member);
-            })
-          ) {
-            throw new Error("Code is invalid");
-          }
-          code = lodash_1.cloneDeep(code);
-          // import related
-          classData.clients = Array.from(
-            new Set(
-              classData.functions.map(function(method) {
-                return method.client;
-              })
-            )
-          );
-          importStatments = new Array(classData.clients.length);
-          importStatments.fill(Object.assign({}, code.statements[0]));
-          code.statements = importStatments.concat(code.statements.slice(1));
-          classDeclarationNode = code.statements.find(function(node) {
-            return ts.isClassDeclaration(node);
-          });
-          constructorNode = classDeclarationNode.members.find(function(node) {
-            return ts.SyntaxKind[node.kind] === "Constructor";
-          });
-          clientObjects = new Array(classData.clients.length);
-          clientObjects.fill(
-            Object.assign({}, constructorNode.body.statements[0])
-          );
-          constructorNode.body.statements = clientObjects;
-          addFunctions = function(context) {
-            return function(rootNode) {
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  var functions_1 = [];
-                  classData.functions.map(function(method) {
-                    var clonedNode;
-                    if (method.returnTypeName === "Promise") {
-                      clonedNode = Object.assign({}, node.members[1]);
-                    } else {
-                      clonedNode = Object.assign({}, node.members[2]);
-                    }
-                    clonedNode.name = ts.createIdentifier(method.functionName);
-                    functions_1.push(clonedNode);
-                  });
-                  var updatedClass = ts.updateClassDeclaration(
-                    node,
-                    node.decorators,
-                    node.modifiers,
-                    node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
-                    ts.createNodeArray([node.members[0]].concat(functions_1))
-                  );
-                  return updatedClass;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addIdentifiers = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              var clientCount = 0;
-              var clientObjCount = 0;
-              function visit(node) {
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var paramNode = ts.createParameter(
-                        undefined,
-                        undefined,
-                        undefined,
-                        param.name
-                      );
-                      if (param.optional) {
-                        paramNode.initializer = ts.createIdentifier(
-                          "undefined"
-                        );
-                      }
-                      return paramNode;
-                    }
-                  );
-                  node.parameters = parameters;
-                }
-                if (ts.isStringLiteral(node) && node.text === "pkgName") {
-                  return ts.createStringLiteral(
-                    "@google-cloud/" + classData.functions[0].pkgName
-                  );
-                }
-                if (
-                  ts.isIdentifier(node) &&
-                  dummyIdentifiers.includes(node.text)
-                ) {
-                  var updatedIdentifier = void 0;
-                  switch (node.text) {
-                    case "ClassName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier("GCP_" + classData.serviceName)
-                      );
-                      break;
-                    case "ClientName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(classData.clients[clientCount])
-                      );
-                      clientCount++;
-                      break;
-                    case "SDKFunctionName":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          classData.functions[count].SDKFunctionName
-                        )
-                      );
-                      count++;
-                      break;
-                    case "_client":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          "_" +
-                            classData.functions[count].client
-                              .toLowerCase()
-                              .charAt(0) +
-                            classData.functions[count].client.substr(1)
-                        )
-                      );
-                      break;
-                    case "_clientObj":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(
-                          "_" +
-                            classData.clients[clientObjCount]
-                              .toLowerCase()
-                              .charAt(0) +
-                            classData.clients[clientObjCount].substr(1)
-                        )
-                      );
-                      break;
-                    case "Client":
-                      updatedIdentifier = ts.updateIdentifier(
-                        ts.createIdentifier(classData.clients[clientObjCount])
-                      );
-                      clientObjCount++;
-                      break;
-                  }
-                  return updatedIdentifier;
-                }
-                if (ts.isCallExpression(node)) {
-                  node.expression.forEachChild(function(childNode) {
-                    if (
-                      ts.isIdentifier(childNode) &&
-                      childNode.text === "SDKFunctionName"
-                    ) {
-                      var args = classData.functions[count].params.map(function(
-                        param
-                      ) {
-                        return ts.createIdentifier(param.name);
-                      });
-                      node.arguments = args;
-                    }
-                  });
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          addComments = function(context) {
-            return function(rootNode) {
-              var count = 0;
-              function visit(node) {
-                if (ts.isClassDeclaration(node)) {
-                  addMultiLineComment(
-                    node,
-                    "This is an auto generated class, please do not change."
-                  );
-                  var comment =
-                    "*\n * Class to create a " +
-                    classData.serviceName +
-                    " object\n * @category Google Cloud\n ";
-                  addMultiLineComment(node, comment);
-                }
-                if (ts.isMethodDeclaration(node)) {
-                  var parameters = classData.functions[count].params.map(
-                    function(param) {
-                      var statment;
-                      if (param.optional) {
-                        statment =
-                          "* @param {" +
-                          param.type +
-                          "} [" +
-                          param.name +
-                          "] - Data required for " +
-                          classData.functions[count].SDKFunctionName;
-                      } else {
-                        statment =
-                          "* @param {" +
-                          param.type +
-                          "} " +
-                          param.name +
-                          " - Data required for " +
-                          classData.functions[count].SDKFunctionName;
-                      }
-                      return statment;
-                    }
-                  );
-                  var comment = void 0;
-                  if (parameters.length > 0) {
-                    var paramStatments_1 = "";
-                    parameters.map(function(param) {
-                      paramStatments_1 = paramStatments_1.concat(
-                        paramStatments_1 === "" ? "" + param : "\n " + param
-                      );
-                    });
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.functions[0].pkgName.split("-")[1] +
-                      "\n " +
-                      paramStatments_1 +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  } else {
-                    comment =
-                      "*\n * Trigers the " +
-                      classData.functions[count].SDKFunctionName +
-                      " function of " +
-                      classData.functions[0].pkgName.split("-")[1] +
-                      "\n * @returns {Promise<" +
-                      classData.functions[count].SDKFunctionName +
-                      "Response>}\n ";
-                  }
-                  addMultiLineComment(node, comment);
-                  count++;
-                }
-                return ts.visitEachChild(node, visit, context);
-              }
-              return ts.visitNode(rootNode, visit);
-            };
-          };
-          return [4 /*yield*/, runTransformation(code, addFunctions)];
-        case 1:
-          result_1 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_1), addIdentifiers)
-          ];
-        case 2:
-          result_2 = _a.sent();
-          return [
-            4 /*yield*/,
-            runTransformation(toSourceFile(result_2), addComments)
-          ];
-        case 3:
-          result_3 = _a.sent();
-          return [2 /*return*/, result_3];
-      }
-    });
-  });
+	return __awaiter(this, void 0, void 0, function() {
+		var node,
+			importStatments,
+			classDeclarationNode,
+			constructorNode,
+			clientObjects,
+			addFunctions,
+			addIdentifiers,
+			addComments,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!classData.functions) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					// import related
+					classData.clients = Array.from(
+						new Set(
+							classData.functions.map(function(method) {
+								return method.client;
+							})
+						)
+					);
+					importStatments = new Array(classData.clients.length);
+					importStatments.fill(Object.assign({}, code.statements[0]));
+					code.statements = importStatments.concat(
+						code.statements.slice(1)
+					);
+					classDeclarationNode = code.statements.find(function(node) {
+						return ts.isClassDeclaration(node);
+					});
+					constructorNode = classDeclarationNode.members.find(
+						function(node) {
+							return ts.SyntaxKind[node.kind] === 'Constructor';
+						}
+					);
+					clientObjects = new Array(classData.clients.length);
+					clientObjects.fill(
+						Object.assign({}, constructorNode.body.statements[0])
+					);
+					constructorNode.body.statements = clientObjects;
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									classData.functions.map(function(method) {
+										var clonedNode;
+										if (
+											method.returnTypeName === 'Promise'
+										) {
+											clonedNode = Object.assign(
+												{},
+												node.members[1]
+											);
+										} else {
+											clonedNode = Object.assign(
+												{},
+												node.members[2]
+											);
+										}
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							var clientCount = 0;
+							var clientObjCount = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters;
+								}
+								if (
+									ts.isStringLiteral(node) &&
+									node.text === 'pkgName'
+								) {
+									return ts.createStringLiteral(
+										'@google-cloud/' +
+											classData.functions[0].pkgName
+									);
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'GCP_' +
+														classData.serviceName
+												)
+											);
+											break;
+										case 'ClientName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.clients[
+														clientCount
+													]
+												)
+											);
+											clientCount++;
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+											break;
+										case '_client':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														classData.functions[
+															count
+														].client
+															.toLowerCase()
+															.charAt(0) +
+														classData.functions[
+															count
+														].client.substr(1)
+												)
+											);
+											break;
+										case '_clientObj':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														classData.clients[
+															clientObjCount
+														]
+															.toLowerCase()
+															.charAt(0) +
+														classData.clients[
+															clientObjCount
+														].substr(1)
+												)
+											);
+											break;
+										case 'Client':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.clients[
+														clientObjCount
+													]
+												)
+											);
+											clientObjCount++;
+											break;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = classData.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args;
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n * Class to create a ' +
+										classData.serviceName +
+										' object\n * @category Google Cloud\n ';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var statment;
+										if (param.optional) {
+											statment =
+												'* @param {' +
+												param.type +
+												'} [' +
+												param.name +
+												'] - Data required for ' +
+												classData.functions[count]
+													.SDKFunctionName;
+										} else {
+											statment =
+												'* @param {' +
+												param.type +
+												'} ' +
+												param.name +
+												' - Data required for ' +
+												classData.functions[count]
+													.SDKFunctionName;
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n ' + param
+											);
+										});
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.functions[0].pkgName.split(
+												'-'
+											)[1] +
+											'\n ' +
+											paramStatments_1 +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									} else {
+										comment =
+											'*\n * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.functions[0].pkgName.split(
+												'-'
+											)[1] +
+											'\n * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n ';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
 }
 exports.clientBasedTransform = clientBasedTransform;
diff --git a/generator/transformers/googleCloud/clientBasedTransformer.ts b/generator/transformers/googleCloud/clientBasedTransformer.ts
index 525086dd..b2819e53 100644
--- a/generator/transformers/googleCloud/clientBasedTransformer.ts
+++ b/generator/transformers/googleCloud/clientBasedTransformer.ts
@@ -1,292 +1,309 @@
-import { cloneDeep } from "lodash";
-import * as ts from "typescript";
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
 
 const dummyIdentifiers = [
-  "ClassName",
-  "SDKFunctionName",
-  "ClientName",
-  "_client",
-  "_clientObj",
-  "Client"
+	'ClassName',
+	'SDKFunctionName',
+	'ClientName',
+	'_client',
+	'_clientObj',
+	'Client',
 ];
 
 const printer: ts.Printer = ts.createPrinter({
-  newLine: ts.NewLineKind.LineFeed,
-  removeComments: false
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
 });
 
 function addMultiLineComment(node, comment: string) {
-  ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    comment,
-    true
-  );
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
 }
 
 function runTransformation(sourceCode, transformMethod): Promise<string> {
-  return new Promise((resolve, reject) => {
-    try {
-      const result = ts.transform(sourceCode, [transformMethod]);
-      const transformedNodes = result.transformed[0];
-      const output = printer.printNode(
-        ts.EmitHint.SourceFile,
-        transformedNodes,
-        sourceCode
-      );
-      resolve(output);
-    } catch (error) {
-      reject(error);
-    }
-  });
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
 }
 
 function toSourceFile(sourceCode: string): ts.SourceFile {
-  return ts.createSourceFile(
-    "dummyClass.js",
-    sourceCode,
-    ts.ScriptTarget.Latest,
-    true
-  );
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
 }
 
 export async function clientBasedTransform(
-  code: ts.SourceFile,
-  classData: any
+	code: ts.SourceFile,
+	classData: any
 ): Promise<string> {
-  const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
 
-  if (!classData.functions) {
-    throw new Error("Input is invalid");
-  }
+	if (!classData.functions) {
+		throw new Error('Input is invalid');
+	}
 
-  if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
-    throw new Error("Code is invalid");
-  }
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
 
-  code = cloneDeep(code);
+	code = cloneDeep(code);
 
-  // import related
-  classData.clients = Array.from(
-    new Set(classData.functions.map(method => method.client))
-  );
-  const importStatments: any = new Array(classData.clients.length);
-  importStatments.fill(Object.assign({}, code.statements[0]));
-  code.statements = importStatments.concat(code.statements.slice(1));
+	// import related
+	classData.clients = Array.from(
+		new Set(classData.functions.map(method => method.client))
+	);
+	const importStatments: any = new Array(classData.clients.length);
+	importStatments.fill(Object.assign({}, code.statements[0]));
+	code.statements = importStatments.concat(code.statements.slice(1));
 
-  let classDeclarationNode: any = code.statements.find(node =>
-    ts.isClassDeclaration(node)
-  );
-  let constructorNode: any = classDeclarationNode.members.find(
-    node => ts.SyntaxKind[node.kind] === "Constructor"
-  );
-  const clientObjects: any = new Array(classData.clients.length);
-  clientObjects.fill(Object.assign({}, constructorNode.body.statements[0]));
-  constructorNode.body.statements = clientObjects;
-  // import related
+	const classDeclarationNode: any = code.statements.find(node =>
+		ts.isClassDeclaration(node)
+	);
+	const constructorNode: any = classDeclarationNode.members.find(
+		node => ts.SyntaxKind[node.kind] === 'Constructor'
+	);
+	const clientObjects: any = new Array(classData.clients.length);
+	clientObjects.fill(Object.assign({}, constructorNode.body.statements[0]));
+	constructorNode.body.statements = clientObjects;
+	// import related
 
-  const addFunctions = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        let functions: any = [];
-        classData.functions.map(method => {
-          let clonedNode;
-          if (method.returnTypeName === "Promise") {
-            clonedNode = Object.assign({}, node.members[1]);
-          } else {
-            clonedNode = Object.assign({}, node.members[2]);
-          }
-          clonedNode.name = ts.createIdentifier(method.functionName);
-          functions.push(clonedNode);
-        });
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				classData.functions.map(method => {
+					let clonedNode;
+					if (method.returnTypeName === 'Promise') {
+						clonedNode = Object.assign({}, node.members[1]);
+					} else {
+						clonedNode = Object.assign({}, node.members[2]);
+					}
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
 
-        const updatedClass = ts.updateClassDeclaration(
-          node,
-          node.decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          ts.createNodeArray([node.members[0]].concat(functions))
-        );
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
 
-        return updatedClass;
-      }
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const addIdentifiers = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
-    let clientCount = 0;
-    let clientObjCount = 0;
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isMethodDeclaration(node)) {
-        const parameters = classData.functions[count].params.map(param => {
-          const paramNode = ts.createParameter(
-            undefined,
-            undefined,
-            undefined,
-            param.name
-          );
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		let clientCount = 0;
+		let clientObjCount = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						const paramNode = ts.createParameter(
+							undefined,
+							undefined,
+							undefined,
+							param.name
+						);
 
-          if (param.optional) {
-            paramNode.initializer = ts.createIdentifier("undefined");
-          }
+						if (param.optional) {
+							paramNode.initializer = ts.createIdentifier(
+								'undefined'
+							);
+						}
 
-          return paramNode;
-        });
+						return paramNode;
+					}
+				);
 
-        node.parameters = parameters;
-      }
+				node.parameters = parameters;
+			}
 
-      if (ts.isStringLiteral(node) && node.text === "pkgName") {
-        return ts.createStringLiteral(
-          "@google-cloud/" + classData.functions[0].pkgName
-        );
-      }
+			if (ts.isStringLiteral(node) && node.text === 'pkgName') {
+				return ts.createStringLiteral(
+					'@google-cloud/' + classData.functions[0].pkgName
+				);
+			}
 
-      if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
-        let updatedIdentifier;
-        switch (node.text) {
-          case "ClassName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier("GCP_" + classData.serviceName)
-            );
-            break;
-          case "ClientName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.clients[clientCount])
-            );
-            clientCount++;
-            break;
-          case "SDKFunctionName":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.functions[count].SDKFunctionName)
-            );
-            count++;
-            break;
-          case "_client":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                "_" +
-                  classData.functions[count].client.toLowerCase().charAt(0) +
-                  classData.functions[count].client.substr(1)
-              )
-            );
-            break;
-          case "_clientObj":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(
-                "_" +
-                  classData.clients[clientObjCount].toLowerCase().charAt(0) +
-                  classData.clients[clientObjCount].substr(1)
-              )
-            );
-            break;
-          case "Client":
-            updatedIdentifier = ts.updateIdentifier(
-              ts.createIdentifier(classData.clients[clientObjCount])
-            );
-            clientObjCount++;
-            break;
-        }
-        return updatedIdentifier;
-      }
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier('GCP_' + classData.serviceName)
+						);
+						break;
+					case 'ClientName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(classData.clients[clientCount])
+						);
+						clientCount++;
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+						break;
+					case '_client':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' +
+									classData.functions[count].client
+										.toLowerCase()
+										.charAt(0) +
+									classData.functions[count].client.substr(1)
+							)
+						);
+						break;
+					case '_clientObj':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' +
+									classData.clients[clientObjCount]
+										.toLowerCase()
+										.charAt(0) +
+									classData.clients[clientObjCount].substr(1)
+							)
+						);
+						break;
+					case 'Client':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.clients[clientObjCount]
+							)
+						);
+						clientObjCount++;
+						break;
+				}
+				return updatedIdentifier;
+			}
 
-      if (ts.isCallExpression(node)) {
-        node.expression.forEachChild(childNode => {
-          if (
-            ts.isIdentifier(childNode) &&
-            childNode.text === "SDKFunctionName"
-          ) {
-            const args = classData.functions[count].params.map(param =>
-              ts.createIdentifier(param.name)
-            );
-            node.arguments = args;
-          }
-        });
-      }
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = classData.functions[count].params.map(
+							param => ts.createIdentifier(param.name)
+						);
+						node.arguments = args;
+					}
+				});
+			}
 
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const addComments = <T extends ts.Node>(
-    context: ts.TransformationContext
-  ) => (rootNode: T) => {
-    let count = 0;
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
 
-    function visit(node: ts.Node): ts.Node {
-      if (ts.isClassDeclaration(node)) {
-        addMultiLineComment(
-          node,
-          "This is an auto generated class, please do not change."
-        );
-        const comment = `*
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
  * Class to create a ${classData.serviceName} object
  * @category Google Cloud
  `;
-        addMultiLineComment(node, comment);
-      }
+				addMultiLineComment(node, comment);
+			}
 
-      if (ts.isMethodDeclaration(node)) {
-        let parameters = classData.functions[count].params.map(param => {
-          let statment;
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						let statment;
 
-          if (param.optional) {
-            statment = `* @param {${param.type}} [${param.name}] - Data required for ${classData.functions[count].SDKFunctionName}`;
-          } else {
-            statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
-          }
-          return statment;
-        });
+						if (param.optional) {
+							statment = `* @param {${param.type}} [${param.name}] - Data required for ${classData.functions[count].SDKFunctionName}`;
+						} else {
+							statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						}
+						return statment;
+					}
+				);
 
-        let comment;
-        if (parameters.length > 0) {
-          let paramStatments: string = "";
-          parameters.map(param => {
-            paramStatments = paramStatments.concat(
-              paramStatments === "" ? `${param}` : `\n ${param}`
-            );
-          });
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n ${param}`
+						);
+					});
 
-          comment = `*
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${
-            classData.functions[0].pkgName.split("-")[1]
-          }
+						classData.functions[0].pkgName.split('-')[1]
+					}
  ${paramStatments}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        } else {
-          comment = `*
+				} else {
+					comment = `*
  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${
-            classData.functions[0].pkgName.split("-")[1]
-          }
+						classData.functions[0].pkgName.split('-')[1]
+					}
  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
  `;
-        }
+				}
 
-        addMultiLineComment(node, comment);
-        count++;
-      }
+				addMultiLineComment(node, comment);
+				count++;
+			}
 
-      return ts.visitEachChild(node, visit, context);
-    }
-    return ts.visitNode(rootNode, visit);
-  };
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
 
-  const result_1 = await runTransformation(code, addFunctions);
-  const result_2 = await runTransformation(
-    toSourceFile(result_1),
-    addIdentifiers
-  );
-  const result_3 = await runTransformation(toSourceFile(result_2), addComments);
-  return result_3;
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
 }
diff --git a/generator/transformers/oracle/transformer.js b/generator/transformers/oracle/transformer.js
new file mode 100644
index 00000000..858a836c
--- /dev/null
+++ b/generator/transformers/oracle/transformer.js
@@ -0,0 +1,477 @@
+'use strict';
+var __awaiter =
+	(this && this.__awaiter) ||
+	function(thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function(resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function(resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step(
+				(generator = generator.apply(thisArg, _arguments || [])).next()
+			);
+		});
+	};
+var __generator =
+	(this && this.__generator) ||
+	function(thisArg, body) {
+		var _ = {
+				label: 0,
+				sent: function() {
+					if (t[0] & 1) throw t[1];
+					return t[1];
+				},
+				trys: [],
+				ops: [],
+			},
+			f,
+			y,
+			t,
+			g;
+		return (
+			(g = { next: verb(0), throw: verb(1), return: verb(2) }),
+			typeof Symbol === 'function' &&
+				(g[Symbol.iterator] = function() {
+					return this;
+				}),
+			g
+		);
+		function verb(n) {
+			return function(v) {
+				return step([n, v]);
+			};
+		}
+		function step(op) {
+			if (f) throw new TypeError('Generator is already executing.');
+			while (_)
+				try {
+					if (
+						((f = 1),
+						y &&
+							(t =
+								op[0] & 2
+									? y['return']
+									: op[0]
+									? y['throw'] ||
+									  ((t = y['return']) && t.call(y), 0)
+									: y.next) &&
+							!(t = t.call(y, op[1])).done)
+					)
+						return t;
+					if (((y = 0), t)) op = [op[0] & 2, t.value];
+					switch (op[0]) {
+						case 0:
+						case 1:
+							t = op;
+							break;
+						case 4:
+							_.label++;
+							return { value: op[1], done: false };
+						case 5:
+							_.label++;
+							y = op[1];
+							op = [0];
+							continue;
+						case 7:
+							op = _.ops.pop();
+							_.trys.pop();
+							continue;
+						default:
+							if (
+								!((t = _.trys),
+								(t = t.length > 0 && t[t.length - 1])) &&
+								(op[0] === 6 || op[0] === 2)
+							) {
+								_ = 0;
+								continue;
+							}
+							if (
+								op[0] === 3 &&
+								(!t || (op[1] > t[0] && op[1] < t[3]))
+							) {
+								_.label = op[1];
+								break;
+							}
+							if (op[0] === 6 && _.label < t[1]) {
+								_.label = t[1];
+								t = op;
+								break;
+							}
+							if (t && _.label < t[2]) {
+								_.label = t[2];
+								_.ops.push(op);
+								break;
+							}
+							if (t[2]) _.ops.pop();
+							_.trys.pop();
+							continue;
+					}
+					op = body.call(thisArg, _);
+				} catch (e) {
+					op = [6, e];
+					y = 0;
+				} finally {
+					f = t = 0;
+				}
+			if (op[0] & 5) throw op[1];
+			return { value: op[0] ? op[1] : void 0, done: true };
+		}
+	};
+exports.__esModule = true;
+exports.transform = void 0;
+var lodash_1 = require('lodash');
+var ts = require('typescript');
+var dummyIdentifiers = [
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
+];
+var printer = ts.createPrinter({
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
+});
+function addMultiLineComment(node, comment) {
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
+}
+function runTransformation(sourceCode, transformMethod) {
+	return new Promise(function(resolve, reject) {
+		try {
+			var result = ts.transform(sourceCode, [transformMethod]);
+			var transformedNodes = result.transformed[0];
+			var output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
+}
+function toSourceFile(sourceCode) {
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
+}
+function transform(code, classData) {
+	return __awaiter(this, void 0, void 0, function() {
+		var addFunctions,
+			addIdentifiers,
+			addComments,
+			node,
+			result_1,
+			result_2,
+			result_3;
+		return __generator(this, function(_a) {
+			switch (_a.label) {
+				case 0:
+					addFunctions = function(context) {
+						return function(rootNode) {
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									var functions_1 = [];
+									classData.functions.map(function(method) {
+										var clonedNode = Object.assign(
+											{},
+											node.members[1]
+										);
+										// console.log("Cloned Node..........\n");//sdadas
+										// console.log(clonedNode);//asdasdasdasd
+										clonedNode.name = ts.createIdentifier(
+											method.functionName
+										);
+										functions_1.push(clonedNode);
+									});
+									var updatedClass = ts.updateClassDeclaration(
+										node,
+										node.decorators,
+										node.modifiers,
+										node.name,
+										node.typeParameters,
+										node.heritageClauses,
+										ts.createNodeArray(
+											[node.members[0]].concat(
+												functions_1
+											)
+										)
+									);
+									return updatedClass;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addIdentifiers = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var paramNode = ts.createParameter(
+											undefined,
+											undefined,
+											undefined,
+											param.name
+										);
+										if (param.optional) {
+											paramNode.initializer = ts.createIdentifier(
+												'undefined'
+											);
+										}
+										return paramNode;
+									});
+									node.parameters = parameters;
+								}
+								if (
+									ts.isIdentifier(node) &&
+									dummyIdentifiers.includes(node.text)
+								) {
+									var updatedIdentifier = void 0;
+									switch (node.text) {
+										case 'ClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'Oracle_' +
+														classData.serviceName
+												)
+											);
+											break;
+										case '_sdkClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													'_' +
+														classData.className
+															.charAt(0)
+															.toLowerCase() +
+														classData.className.substr(
+															1
+														)
+												)
+											);
+											break;
+										case 'SDKClassName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.className
+														.charAt(0)
+														.toLowerCase() +
+														classData.className.substr(
+															1
+														)
+												)
+											);
+											break;
+										case 'SDKFunctionName':
+											updatedIdentifier = ts.updateIdentifier(
+												ts.createIdentifier(
+													classData.functions[count]
+														.SDKFunctionName
+												)
+											);
+											count++;
+									}
+									return updatedIdentifier;
+								}
+								if (ts.isCallExpression(node)) {
+									node.expression.forEachChild(function(
+										childNode
+									) {
+										if (
+											ts.isIdentifier(childNode) &&
+											childNode.text === 'SDKFunctionName'
+										) {
+											var args = classData.functions[
+												count
+											].params.map(function(param) {
+												return ts.createIdentifier(
+													param.name
+												);
+											});
+											node.arguments = args.concat(
+												node.arguments
+											);
+										}
+									});
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					addComments = function(context) {
+						return function(rootNode) {
+							var count = 0;
+							function visit(node) {
+								if (ts.isClassDeclaration(node)) {
+									addMultiLineComment(
+										node,
+										'This is an auto generated class, please do not change.'
+									);
+									var comment =
+										'*\n  * Class to create a ' +
+										classData.className +
+										' object\n  * @category Oracle Cloud       \n  ';
+									addMultiLineComment(node, comment);
+								}
+								if (ts.isMethodDeclaration(node)) {
+									var parameters = classData.functions[
+										count
+									].params.map(function(param) {
+										var statment;
+										if (param.optional) {
+											if (param.type == 'TypeReference')
+												statment =
+													'* @param {' +
+													param.typeName +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+											else
+												statment =
+													'* @param {' +
+													param.type +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+										} else {
+											if (param.type == 'TypeReference')
+												statment =
+													'* @param {' +
+													param.typeName +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+											else
+												statment =
+													'* @param {' +
+													param.type +
+													'} ' +
+													param.name +
+													' - Data required for ' +
+													classData.functions[count]
+														.SDKFunctionName;
+										}
+										return statment;
+									});
+									var comment = void 0;
+									if (parameters.length > 0) {
+										var paramStatments_1 = '';
+										parameters.map(function(param) {
+											paramStatments_1 = paramStatments_1.concat(
+												paramStatments_1 === ''
+													? '' + param
+													: '\n' + param
+											);
+										});
+										comment =
+											'*\n  * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n  ' +
+											paramStatments_1 +
+											'\n  * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n  ';
+									} else {
+										comment =
+											'*\n  * Trigers the ' +
+											classData.functions[count]
+												.SDKFunctionName +
+											' function of ' +
+											classData.className +
+											'\n  * @returns {Promise<' +
+											classData.functions[count]
+												.SDKFunctionName +
+											'Response>}\n  ';
+									}
+									addMultiLineComment(node, comment);
+									count++;
+								}
+								return ts.visitEachChild(node, visit, context);
+							}
+							return ts.visitNode(rootNode, visit);
+						};
+					};
+					node = code.statements.find(function(stm) {
+						return ts.isClassDeclaration(stm);
+					});
+					if (!classData.className || !classData.functions) {
+						throw new Error('Input is invalid');
+					}
+					if (
+						!node ||
+						!node.members.some(function(member) {
+							return ts.isMethodDeclaration(member);
+						})
+					) {
+						throw new Error('Code is invalid');
+					}
+					code = lodash_1.cloneDeep(code);
+					return [4 /*yield*/, runTransformation(code, addFunctions)];
+				case 1:
+					result_1 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(
+							toSourceFile(result_1),
+							addIdentifiers
+						),
+					];
+				case 2:
+					result_2 = _a.sent();
+					return [
+						4 /*yield*/,
+						runTransformation(toSourceFile(result_2), addComments),
+					];
+				case 3:
+					result_3 = _a.sent();
+					return [2 /*return*/, result_3];
+			}
+		});
+	});
+}
+exports.transform = transform;
diff --git a/generator/transformers/oracle/transformer.ts b/generator/transformers/oracle/transformer.ts
new file mode 100644
index 00000000..c5157dd1
--- /dev/null
+++ b/generator/transformers/oracle/transformer.ts
@@ -0,0 +1,275 @@
+import { cloneDeep } from 'lodash';
+import * as ts from 'typescript';
+
+const dummyIdentifiers = [
+	'ClassName',
+	'_sdkClassName',
+	'SDKClassName',
+	'SDKFunctionName',
+];
+
+const printer: ts.Printer = ts.createPrinter({
+	newLine: ts.NewLineKind.LineFeed,
+	removeComments: false,
+});
+
+function addMultiLineComment(node, comment: string) {
+	ts.addSyntheticLeadingComment(
+		node,
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		comment,
+		true
+	);
+}
+
+function runTransformation(sourceCode, transformMethod): Promise<string> {
+	return new Promise((resolve, reject) => {
+		try {
+			const result = ts.transform(sourceCode, [transformMethod]);
+			const transformedNodes = result.transformed[0];
+			const output = printer.printNode(
+				ts.EmitHint.SourceFile,
+				transformedNodes,
+				sourceCode
+			);
+			resolve(output);
+		} catch (error) {
+			reject(error);
+		}
+	});
+}
+
+function toSourceFile(sourceCode: string): ts.SourceFile {
+	return ts.createSourceFile(
+		'dummyClass.js',
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true
+	);
+}
+export async function transform(
+	code: ts.SourceFile,
+	classData: any
+): Promise<string> {
+	/*
+	 * Transformation function for adding Functions
+	 */
+	const addFunctions = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				const functions: any = [];
+				classData.functions.map(method => {
+					const clonedNode = Object.assign({}, node.members[1]);
+					clonedNode.name = ts.createIdentifier(method.functionName);
+					functions.push(clonedNode);
+				});
+
+				const updatedClass = ts.updateClassDeclaration(
+					node,
+					node.decorators,
+					node.modifiers,
+					node.name,
+					node.typeParameters,
+					node.heritageClauses,
+					ts.createNodeArray([node.members[0]].concat(functions))
+				);
+
+				return updatedClass;
+			}
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 *  Transformation function for adding Identifiers/Parameters
+	 */
+	const addIdentifiers = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						const paramNode = ts.createParameter(
+							undefined,
+							undefined,
+							undefined,
+							param.name
+						);
+
+						if (param.optional) {
+							paramNode.initializer = ts.createIdentifier(
+								'undefined'
+							);
+						}
+
+						return paramNode;
+					}
+				);
+
+				node.parameters = parameters;
+			}
+
+			if (ts.isIdentifier(node) && dummyIdentifiers.includes(node.text)) {
+				let updatedIdentifier;
+
+				switch (node.text) {
+					case 'ClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'Oracle_' + classData.serviceName
+							)
+						);
+						break;
+					case '_sdkClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								'_' +
+									classData.className
+										.charAt(0)
+										.toLowerCase() +
+									classData.className.substr(1)
+							)
+						);
+						break;
+					case 'SDKClassName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.className.charAt(0).toLowerCase() +
+									classData.className.substr(1)
+							)
+						);
+						break;
+					case 'SDKFunctionName':
+						updatedIdentifier = ts.updateIdentifier(
+							ts.createIdentifier(
+								classData.functions[count].SDKFunctionName
+							)
+						);
+						count++;
+				}
+
+				return updatedIdentifier;
+			}
+
+			if (ts.isCallExpression(node)) {
+				node.expression.forEachChild(childNode => {
+					if (
+						ts.isIdentifier(childNode) &&
+						childNode.text === 'SDKFunctionName'
+					) {
+						const args = classData.functions[count].params.map(
+							param => ts.createIdentifier(param.name)
+						);
+						node.arguments = args.concat(node.arguments);
+					}
+				});
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 *Transformation function for adding comments
+	 */
+
+	const addComments = <T extends ts.Node>(
+		context: ts.TransformationContext
+	) => (rootNode: T) => {
+		let count = 0;
+
+		function visit(node: ts.Node): ts.Node {
+			if (ts.isClassDeclaration(node)) {
+				addMultiLineComment(
+					node,
+					'This is an auto generated class, please do not change.'
+				);
+				const comment = `*
+  * Class to create a ${classData.className} object
+  * @category Oracle Cloud       
+  `;
+				addMultiLineComment(node, comment);
+			}
+
+			if (ts.isMethodDeclaration(node)) {
+				const parameters = classData.functions[count].params.map(
+					param => {
+						let statment;
+
+						if (param.optional) {
+							if (param.type == 'TypeReference')
+								statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+							else
+								statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						} else {
+							if (param.type == 'TypeReference')
+								statment = `* @param {${param.typeName}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+							else
+								statment = `* @param {${param.type}} ${param.name} - Data required for ${classData.functions[count].SDKFunctionName}`;
+						}
+						return statment;
+					}
+				);
+
+				let comment;
+				if (parameters.length > 0) {
+					let paramStatments: string = '';
+					parameters.map(param => {
+						paramStatments = paramStatments.concat(
+							paramStatments === '' ? `${param}` : `\n${param}`
+						);
+					});
+
+					comment = `*
+  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
+  ${paramStatments}
+  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
+  `;
+				} else {
+					comment = `*
+  * Trigers the ${classData.functions[count].SDKFunctionName} function of ${classData.className}
+  * @returns {Promise<${classData.functions[count].SDKFunctionName}Response>}
+  `;
+				}
+
+				addMultiLineComment(node, comment);
+				count++;
+			}
+
+			return ts.visitEachChild(node, visit, context);
+		}
+		return ts.visitNode(rootNode, visit);
+	};
+
+	/*
+	 * Code to get node and run tranformations
+	 */
+	const node: any = code.statements.find(stm => ts.isClassDeclaration(stm));
+
+	if (!classData.className || !classData.functions) {
+		throw new Error('Input is invalid');
+	}
+
+	if (!node || !node.members.some(member => ts.isMethodDeclaration(member))) {
+		throw new Error('Code is invalid');
+	}
+
+	code = cloneDeep(code);
+
+	const result_1 = await runTransformation(code, addFunctions);
+	const result_2 = await runTransformation(
+		toSourceFile(result_1),
+		addIdentifiers
+	);
+	const result_3 = await runTransformation(
+		toSourceFile(result_2),
+		addComments
+	);
+	return result_3;
+}