diff --git a/src/index.ts b/src/index.ts
index d86b8bb..9409a2b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -51,7 +51,9 @@ import { GetItemsResource } from "./model/GetItemsResource";
 import { ItemIdType } from "./model/ItemIdType";
 import { Languages } from "./model/Languages";
 import { LanguageType } from "./model/LanguageType";
+import { Merchant } from "./model/Merchant";
 import { MultiValuedAttribute } from "./model/MultiValuedAttribute";
+import { OfferCount } from "./model/OfferCount";
 import { OfferPrice } from "./model/OfferPrice";
 import { OfferSavings } from "./model/OfferSavings";
 import { PartnerType } from "./model/PartnerType";
diff --git a/src/model/Merchant.ts b/src/model/Merchant.ts
index 4842697..c04a5cc 100644
--- a/src/model/Merchant.ts
+++ b/src/model/Merchant.ts
@@ -21,51 +21,45 @@
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.ProductAdvertisingAPIv1) {
-      root.ProductAdvertisingAPIv1 = {};
-    }
-    root.ProductAdvertisingAPIv1.Merchant = factory(root.ProductAdvertisingAPIv1.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
+/**
+ * Enum class Merchant.
+ * @enum {}
+ * @readonly
+ */
+export const enum MerchantValues {
   /**
-   * Enum class Merchant.
-   * @enum {}
-   * @readonly
+   * value: "All"
+   * @const
    */
-  var exports = {
-    /**
-     * value: "All"
-     * @const
-     */
-    "All": "All",
-    /**
-     * value: "Amazon"
-     * @const
-     */
-    "Amazon": "Amazon"  };
+  All = "All",
+  /**
+   * value: "Amazon"
+   * @const
+   */
+  Amazon = "Amazon",
+};
+
+/**
+ * Enum class Merchant.
+ * @enum {}
+ * @readonly
+ */
+export class Merchant {
+  /**
+   * value: "All"
+   * @const
+   */
+  public static get All() { return MerchantValues.All; }
+  /**
+   * value: "Amazon"
+   * @const
+   */
+  public static get Amazon() { return MerchantValues.Amazon; }
 
   /**
    * Returns a <code>Merchant</code> enum value from a Javascript object name.
    * @param {Object} data The plain JavaScript object containing the name of the enum value.
    * @return {module:model/Merchant} The enum <code>Merchant</code> value.
    */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
-
-
+  public static constructFromObject(object) { return object; }
+};
\ No newline at end of file
diff --git a/src/model/OfferCount.ts b/src/model/OfferCount.ts
index 2bcc8a4..2cf5737 100644
--- a/src/model/OfferCount.ts
+++ b/src/model/OfferCount.ts
@@ -42,7 +42,5 @@ export class OfferCount {
    * @param {module:model/OfferCount} obj Optional instance to populate.
    * @return {module:model/OfferCount} The populated <code>OfferCount</code> instance.
    */
-  public static constructFromObject(data: any, _obj?: string) {
-    return data;
-  }
+  public static constructFromObject(data: any, _obj?: string) { return data; }
 };