diff --git a/doc/controllers/events.md b/doc/controllers/events.md
index d3ec65b5..43fab79b 100644
--- a/doc/controllers/events.md
+++ b/doc/controllers/events.md
@@ -100,7 +100,7 @@ List<EventResponse> listEvents(
 | `sinceId` | `Long` | Query, Optional | Returns events with an id greater than or equal to the one specified |
 | `maxId` | `Long` | Query, Optional | Returns events with an id less than or equal to the one specified |
 | `direction` | [`Direction`](../../doc/models/direction.md) | Query, Optional | The sort direction of the returned events.<br>**Default**: `Direction.DESC` |
-| `filter` | [`List<EventType>`](../../doc/models/event-type.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
+| `filter` | [`List<EventKey>`](../../doc/models/event-key.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
 | `dateField` | [`ListEventsDateField`](../../doc/models/list-events-date-field.md) | Query, Optional | The type of filter you would like to apply to your search. |
 | `startDate` | `String` | Query, Optional | The start date (format YYYY-MM-DD) with which to filter the date_field. Returns components with a timestamp at or after midnight (12:00:00 AM) in your site’s time zone on the date specified. |
 | `endDate` | `String` | Query, Optional | The end date (format YYYY-MM-DD) with which to filter the date_field. Returns components with a timestamp up to and including 11:59:59PM in your site’s time zone on the date specified. |
@@ -119,8 +119,8 @@ ListEventsInput listEventsInput = new ListEventsInput.Builder()
     .perPage(50)
     .direction(Direction.DESC)
     .filter(Arrays.asList(
-        EventType.CUSTOM_FIELD_VALUE_CHANGE,
-        EventType.PAYMENT_SUCCESS
+        EventKey.CUSTOM_FIELD_VALUE_CHANGE,
+        EventKey.PAYMENT_SUCCESS
     ))
     .dateField(ListEventsDateField.CREATED_AT)
     .build();
@@ -227,7 +227,7 @@ List<EventResponse> listSubscriptionEvents(
 | `sinceId` | `Long` | Query, Optional | Returns events with an id greater than or equal to the one specified |
 | `maxId` | `Long` | Query, Optional | Returns events with an id less than or equal to the one specified |
 | `direction` | [`Direction`](../../doc/models/direction.md) | Query, Optional | The sort direction of the returned events.<br>**Default**: `Direction.DESC` |
-| `filter` | [`List<EventType>`](../../doc/models/event-type.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
+| `filter` | [`List<EventKey>`](../../doc/models/event-key.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
 
 ## Response Type
 
@@ -243,8 +243,8 @@ ListSubscriptionEventsInput listSubscriptionEventsInput = new ListSubscriptionEv
 .perPage(50)
 .direction(Direction.DESC)
 .filter(Arrays.asList(
-        EventType.CUSTOM_FIELD_VALUE_CHANGE,
-        EventType.PAYMENT_SUCCESS
+        EventKey.CUSTOM_FIELD_VALUE_CHANGE,
+        EventKey.PAYMENT_SUCCESS
     ))
 .build();
 
@@ -320,7 +320,7 @@ CountResponse readEventsCount(
 | `sinceId` | `Long` | Query, Optional | Returns events with an id greater than or equal to the one specified |
 | `maxId` | `Long` | Query, Optional | Returns events with an id less than or equal to the one specified |
 | `direction` | [`Direction`](../../doc/models/direction.md) | Query, Optional | The sort direction of the returned events.<br>**Default**: `Direction.DESC` |
-| `filter` | [`List<EventType>`](../../doc/models/event-type.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
+| `filter` | [`List<EventKey>`](../../doc/models/event-key.md) | Query, Optional | You can pass multiple event keys after comma.<br>Use in query `filter=signup_success,payment_success`. |
 
 ## Response Type
 
@@ -334,8 +334,8 @@ ReadEventsCountInput readEventsCountInput = new ReadEventsCountInput.Builder()
     .perPage(50)
     .direction(Direction.DESC)
     .filter(Arrays.asList(
-        EventType.CUSTOM_FIELD_VALUE_CHANGE,
-        EventType.PAYMENT_SUCCESS
+        EventKey.CUSTOM_FIELD_VALUE_CHANGE,
+        EventKey.PAYMENT_SUCCESS
     ))
     .build();
 
diff --git a/doc/controllers/product-price-points.md b/doc/controllers/product-price-points.md
index fa76c075..1dbaf060 100644
--- a/doc/controllers/product-price-points.md
+++ b/doc/controllers/product-price-points.md
@@ -132,6 +132,7 @@ ListProductPricePointsResponse listProductPricePoints(
 | `perPage` | `Integer` | Query, Optional | This parameter indicates how many records to fetch in each request. Default value is 10. The maximum allowed values is 200; any per_page value over 200 will be changed to 200.<br>**Default**: `10`<br>**Constraints**: `<= 200` |
 | `currencyPrices` | `Boolean` | Query, Optional | When fetching a product's price points, if you have defined multiple currencies at the site level, you can optionally pass the ?currency_prices=true query param to include an array of currency price data in the response. If the product price point is set to use_site_exchange_rate: true, it will return pricing based on the current exchange rate. If the flag is set to false, it will return all of the defined prices for each currency. |
 | `filterType` | [`List<PricePointType>`](../../doc/models/price-point-type.md) | Query, Optional | Use in query: `filter[type]=catalog,default`. |
+| `archived` | `Boolean` | Query, Optional | Set to include archived price points in the response. |
 
 ## Response Type
 
diff --git a/doc/models/event-type.md b/doc/models/event-type.md
deleted file mode 100644
index 35c63e82..00000000
--- a/doc/models/event-type.md
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# Event Type
-
-## Enumeration
-
-`EventType`
-
-## Fields
-
-| Name |
-|  --- |
-| `AccountTransactionChanged` |
-| `BillingDateChange` |
-| `ComponentAllocationChange` |
-| `CustomerUpdate` |
-| `CustomerCreate` |
-| `DunningStepReached` |
-| `ExpirationDateChange` |
-| `ExpiringCard` |
-| `MeteredUsage` |
-| `PaymentSuccess` |
-| `PaymentSuccessRecreated` |
-| `PaymentFailure` |
-| `PaymentFailureRecreated` |
-| `RefundFailure` |
-| `RefundSuccess` |
-| `RenewalSuccess` |
-| `RenewalSuccessRecreated` |
-| `RenewalFailure` |
-| `SignupSuccess` |
-| `SignupFailure` |
-| `StatementClosed` |
-| `StatementSettled` |
-| `SubscriptionBankAccountUpdate` |
-| `SubscriptionDeletion` |
-| `SubscriptionPaypalAccountUpdate` |
-| `SubscriptionProductChange` |
-| `SubscriptionStateChange` |
-| `TrialEndNotice` |
-| `UpgradeDowngradeSuccess` |
-| `UpgradeDowngradeFailure` |
-| `UpcomingRenewalNotice` |
-| `CustomFieldValueChange` |
-| `SubscriptionPrepaymentAccountBalanceChanged` |
-| `SubscriptionServiceCreditAccountBalanceChanged` |
-
diff --git a/src/main/java/com/maxio/advancedbilling/controllers/EventsController.java b/src/main/java/com/maxio/advancedbilling/controllers/EventsController.java
index 19cd120a..e9f497d1 100644
--- a/src/main/java/com/maxio/advancedbilling/controllers/EventsController.java
+++ b/src/main/java/com/maxio/advancedbilling/controllers/EventsController.java
@@ -11,8 +11,8 @@
 import com.maxio.advancedbilling.exceptions.ApiException;
 import com.maxio.advancedbilling.http.request.HttpMethod;
 import com.maxio.advancedbilling.models.CountResponse;
+import com.maxio.advancedbilling.models.EventKey;
 import com.maxio.advancedbilling.models.EventResponse;
-import com.maxio.advancedbilling.models.EventType;
 import com.maxio.advancedbilling.models.ListEventsInput;
 import com.maxio.advancedbilling.models.ListSubscriptionEventsInput;
 import com.maxio.advancedbilling.models.ReadEventsCountInput;
@@ -93,7 +93,7 @@ private ApiCall<List<EventResponse>, ApiException> prepareListEventsRequest(
                         .queryParam(param -> param.key("direction")
                                 .value((input.getDirection() != null) ? input.getDirection().value() : "desc").isRequired(false))
                         .queryParam(param -> param.key("filter")
-                                .value(EventType.toValue(input.getFilter())).isRequired(false))
+                                .value(EventKey.toValue(input.getFilter())).isRequired(false))
                         .queryParam(param -> param.key("date_field")
                                 .value((input.getDateField() != null) ? input.getDateField().value() : null).isRequired(false))
                         .queryParam(param -> param.key("start_date")
@@ -156,7 +156,7 @@ private ApiCall<List<EventResponse>, ApiException> prepareListSubscriptionEvents
                         .queryParam(param -> param.key("direction")
                                 .value((input.getDirection() != null) ? input.getDirection().value() : "desc").isRequired(false))
                         .queryParam(param -> param.key("filter")
-                                .value(EventType.toValue(input.getFilter())).isRequired(false))
+                                .value(EventKey.toValue(input.getFilter())).isRequired(false))
                         .templateParam(param -> param.key("subscription_id").value(input.getSubscriptionId()).isRequired(false)
                                 .shouldEncode(true))
                         .headerParam(param -> param.key("accept").value("application/json"))
@@ -206,7 +206,7 @@ private ApiCall<CountResponse, ApiException> prepareReadEventsCountRequest(
                         .queryParam(param -> param.key("direction")
                                 .value((input.getDirection() != null) ? input.getDirection().value() : "desc").isRequired(false))
                         .queryParam(param -> param.key("filter")
-                                .value(EventType.toValue(input.getFilter())).isRequired(false))
+                                .value(EventKey.toValue(input.getFilter())).isRequired(false))
                         .headerParam(param -> param.key("accept").value("application/json"))
                         .withAuth(auth -> auth
                                 .add("BasicAuth"))
diff --git a/src/main/java/com/maxio/advancedbilling/controllers/ProductPricePointsController.java b/src/main/java/com/maxio/advancedbilling/controllers/ProductPricePointsController.java
index b06a899b..61f32f93 100644
--- a/src/main/java/com/maxio/advancedbilling/controllers/ProductPricePointsController.java
+++ b/src/main/java/com/maxio/advancedbilling/controllers/ProductPricePointsController.java
@@ -132,6 +132,8 @@ private ApiCall<ListProductPricePointsResponse, ApiException> prepareListProduct
                                 .value(input.getCurrencyPrices()).isRequired(false))
                         .queryParam(param -> param.key("filter[type]")
                                 .value(PricePointType.toValue(input.getFilterType())).isRequired(false))
+                        .queryParam(param -> param.key("archived")
+                                .value(input.getArchived()).isRequired(false))
                         .templateParam(param -> param.key("product_id").value(input.getProductId())
                                 .shouldEncode(true))
                         .headerParam(param -> param.key("accept").value("application/json"))
diff --git a/src/main/java/com/maxio/advancedbilling/models/EventType.java b/src/main/java/com/maxio/advancedbilling/models/EventType.java
deleted file mode 100644
index afbecd0b..00000000
--- a/src/main/java/com/maxio/advancedbilling/models/EventType.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * AdvancedBilling
- *
- * This file was automatically generated for Maxio by APIMATIC v3.0 ( https://www.apimatic.io ).
- */
-
-package com.maxio.advancedbilling.models;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeMap;
-
-
-/**
- * EventType to be used.
- */
-public enum EventType {
-    ACCOUNT_TRANSACTION_CHANGED,
-
-    BILLING_DATE_CHANGE,
-
-    COMPONENT_ALLOCATION_CHANGE,
-
-    CUSTOMER_UPDATE,
-
-    CUSTOMER_CREATE,
-
-    DUNNING_STEP_REACHED,
-
-    EXPIRATION_DATE_CHANGE,
-
-    EXPIRING_CARD,
-
-    METERED_USAGE,
-
-    PAYMENT_SUCCESS,
-
-    PAYMENT_SUCCESS_RECREATED,
-
-    PAYMENT_FAILURE,
-
-    PAYMENT_FAILURE_RECREATED,
-
-    REFUND_FAILURE,
-
-    REFUND_SUCCESS,
-
-    RENEWAL_SUCCESS,
-
-    RENEWAL_SUCCESS_RECREATED,
-
-    RENEWAL_FAILURE,
-
-    SIGNUP_SUCCESS,
-
-    SIGNUP_FAILURE,
-
-    STATEMENT_CLOSED,
-
-    STATEMENT_SETTLED,
-
-    SUBSCRIPTION_BANK_ACCOUNT_UPDATE,
-
-    SUBSCRIPTION_DELETION,
-
-    SUBSCRIPTION_PAYPAL_ACCOUNT_UPDATE,
-
-    SUBSCRIPTION_PRODUCT_CHANGE,
-
-    SUBSCRIPTION_STATE_CHANGE,
-
-    TRIAL_END_NOTICE,
-
-    UPGRADE_DOWNGRADE_SUCCESS,
-
-    UPGRADE_DOWNGRADE_FAILURE,
-
-    UPCOMING_RENEWAL_NOTICE,
-
-    CUSTOM_FIELD_VALUE_CHANGE,
-
-    SUBSCRIPTION_PREPAYMENT_ACCOUNT_BALANCE_CHANGED,
-
-    SUBSCRIPTION_SERVICE_CREDIT_ACCOUNT_BALANCE_CHANGED;
-
-
-    private static TreeMap<String, EventType> valueMap = new TreeMap<>();
-    private String value;
-
-    static {
-        ACCOUNT_TRANSACTION_CHANGED.value = "account_transaction_changed";
-        BILLING_DATE_CHANGE.value = "billing_date_change";
-        COMPONENT_ALLOCATION_CHANGE.value = "component_allocation_change";
-        CUSTOMER_UPDATE.value = "customer_update";
-        CUSTOMER_CREATE.value = "customer_create";
-        DUNNING_STEP_REACHED.value = "dunning_step_reached";
-        EXPIRATION_DATE_CHANGE.value = "expiration_date_change";
-        EXPIRING_CARD.value = "expiring_card";
-        METERED_USAGE.value = "metered_usage";
-        PAYMENT_SUCCESS.value = "payment_success";
-        PAYMENT_SUCCESS_RECREATED.value = "payment_success_recreated";
-        PAYMENT_FAILURE.value = "payment_failure";
-        PAYMENT_FAILURE_RECREATED.value = "payment_failure_recreated";
-        REFUND_FAILURE.value = "refund_failure";
-        REFUND_SUCCESS.value = "refund_success";
-        RENEWAL_SUCCESS.value = "renewal_success";
-        RENEWAL_SUCCESS_RECREATED.value = "renewal_success_recreated";
-        RENEWAL_FAILURE.value = "renewal_failure";
-        SIGNUP_SUCCESS.value = "signup_success";
-        SIGNUP_FAILURE.value = "signup_failure";
-        STATEMENT_CLOSED.value = "statement_closed";
-        STATEMENT_SETTLED.value = "statement_settled";
-        SUBSCRIPTION_BANK_ACCOUNT_UPDATE.value = "subscription_bank_account_update";
-        SUBSCRIPTION_DELETION.value = "subscription_deletion";
-        SUBSCRIPTION_PAYPAL_ACCOUNT_UPDATE.value = "subscription_paypal_account_update";
-        SUBSCRIPTION_PRODUCT_CHANGE.value = "subscription_product_change";
-        SUBSCRIPTION_STATE_CHANGE.value = "subscription_state_change";
-        TRIAL_END_NOTICE.value = "trial_end_notice";
-        UPGRADE_DOWNGRADE_SUCCESS.value = "upgrade_downgrade_success";
-        UPGRADE_DOWNGRADE_FAILURE.value = "upgrade_downgrade_failure";
-        UPCOMING_RENEWAL_NOTICE.value = "upcoming_renewal_notice";
-        CUSTOM_FIELD_VALUE_CHANGE.value = "custom_field_value_change";
-        SUBSCRIPTION_PREPAYMENT_ACCOUNT_BALANCE_CHANGED.value = "subscription_prepayment_account_balance_changed";
-        SUBSCRIPTION_SERVICE_CREDIT_ACCOUNT_BALANCE_CHANGED.value = "subscription_service_credit_account_balance_changed";
-
-        valueMap.put("account_transaction_changed", ACCOUNT_TRANSACTION_CHANGED);
-        valueMap.put("billing_date_change", BILLING_DATE_CHANGE);
-        valueMap.put("component_allocation_change", COMPONENT_ALLOCATION_CHANGE);
-        valueMap.put("customer_update", CUSTOMER_UPDATE);
-        valueMap.put("customer_create", CUSTOMER_CREATE);
-        valueMap.put("dunning_step_reached", DUNNING_STEP_REACHED);
-        valueMap.put("expiration_date_change", EXPIRATION_DATE_CHANGE);
-        valueMap.put("expiring_card", EXPIRING_CARD);
-        valueMap.put("metered_usage", METERED_USAGE);
-        valueMap.put("payment_success", PAYMENT_SUCCESS);
-        valueMap.put("payment_success_recreated", PAYMENT_SUCCESS_RECREATED);
-        valueMap.put("payment_failure", PAYMENT_FAILURE);
-        valueMap.put("payment_failure_recreated", PAYMENT_FAILURE_RECREATED);
-        valueMap.put("refund_failure", REFUND_FAILURE);
-        valueMap.put("refund_success", REFUND_SUCCESS);
-        valueMap.put("renewal_success", RENEWAL_SUCCESS);
-        valueMap.put("renewal_success_recreated", RENEWAL_SUCCESS_RECREATED);
-        valueMap.put("renewal_failure", RENEWAL_FAILURE);
-        valueMap.put("signup_success", SIGNUP_SUCCESS);
-        valueMap.put("signup_failure", SIGNUP_FAILURE);
-        valueMap.put("statement_closed", STATEMENT_CLOSED);
-        valueMap.put("statement_settled", STATEMENT_SETTLED);
-        valueMap.put("subscription_bank_account_update", SUBSCRIPTION_BANK_ACCOUNT_UPDATE);
-        valueMap.put("subscription_deletion", SUBSCRIPTION_DELETION);
-        valueMap.put("subscription_paypal_account_update", SUBSCRIPTION_PAYPAL_ACCOUNT_UPDATE);
-        valueMap.put("subscription_product_change", SUBSCRIPTION_PRODUCT_CHANGE);
-        valueMap.put("subscription_state_change", SUBSCRIPTION_STATE_CHANGE);
-        valueMap.put("trial_end_notice", TRIAL_END_NOTICE);
-        valueMap.put("upgrade_downgrade_success", UPGRADE_DOWNGRADE_SUCCESS);
-        valueMap.put("upgrade_downgrade_failure", UPGRADE_DOWNGRADE_FAILURE);
-        valueMap.put("upcoming_renewal_notice", UPCOMING_RENEWAL_NOTICE);
-        valueMap.put("custom_field_value_change", CUSTOM_FIELD_VALUE_CHANGE);
-        valueMap.put("subscription_prepayment_account_balance_changed", SUBSCRIPTION_PREPAYMENT_ACCOUNT_BALANCE_CHANGED);
-        valueMap.put("subscription_service_credit_account_balance_changed", SUBSCRIPTION_SERVICE_CREDIT_ACCOUNT_BALANCE_CHANGED);
-    }
-
-    /**
-     * Returns the enum member associated with the given string value.
-     * @param toConvert String value to get enum member.
-     * @return The enum member against the given string value.
-     * @throws IOException when provided value is not mapped to any enum member.
-     */
-    @JsonCreator
-    public static EventType constructFromString(String toConvert) throws IOException {
-        EventType enumValue = fromString(toConvert);
-        if (enumValue == null) {
-            throw new IOException("Unable to create enum instance with value: " + toConvert);
-        }
-        return enumValue;
-    }
-
-    /**
-     * Returns the enum member associated with the given string value.
-     * @param toConvert String value to get enum member.
-     * @return The enum member against the given string value.
-     */
-    public static EventType fromString(String toConvert) {
-        return valueMap.get(toConvert);
-    }
-
-    /**
-     * Returns the string value associated with the enum member.
-     * @return The string value against enum member.
-     */
-    @JsonValue
-    public String value() {
-        return value;
-    }
-        
-    /**
-     * Get string representation of this enum.
-     */
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Convert list of EventType values to list of string values.
-     * @param toConvert The list of EventType values to convert.
-     * @return List of representative string values.
-     */
-    public static List<String> toValue(List<EventType> toConvert) {
-        if (toConvert == null) {
-            return null;
-        }
-        List<String> convertedValues = new ArrayList<>();
-        for (EventType enumValue : toConvert) {
-            convertedValues.add(enumValue.value);
-        }
-        return convertedValues;
-    }
-} 
\ No newline at end of file
diff --git a/src/main/java/com/maxio/advancedbilling/models/ListEventsInput.java b/src/main/java/com/maxio/advancedbilling/models/ListEventsInput.java
index b9f49972..0014aea4 100644
--- a/src/main/java/com/maxio/advancedbilling/models/ListEventsInput.java
+++ b/src/main/java/com/maxio/advancedbilling/models/ListEventsInput.java
@@ -20,7 +20,7 @@ public class ListEventsInput {
     private Long sinceId;
     private Long maxId;
     private Direction direction;
-    private List<EventType> filter;
+    private List<EventKey> filter;
     private ListEventsDateField dateField;
     private String startDate;
     private String endDate;
@@ -43,7 +43,7 @@ public ListEventsInput() {
      * @param  sinceId  Long value for sinceId.
      * @param  maxId  Long value for maxId.
      * @param  direction  Direction value for direction.
-     * @param  filter  List of EventType value for filter.
+     * @param  filter  List of EventKey value for filter.
      * @param  dateField  ListEventsDateField value for dateField.
      * @param  startDate  String value for startDate.
      * @param  endDate  String value for endDate.
@@ -56,7 +56,7 @@ public ListEventsInput(
             Long sinceId,
             Long maxId,
             Direction direction,
-            List<EventType> filter,
+            List<EventKey> filter,
             ListEventsDateField dateField,
             String startDate,
             String endDate,
@@ -196,11 +196,11 @@ public void setDirection(Direction direction) {
      * Getter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @return Returns the List of EventType
+     * @return Returns the List of EventKey
      */
     @JsonGetter("filter")
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    public List<EventType> getFilter() {
+    public List<EventKey> getFilter() {
         return filter;
     }
 
@@ -208,10 +208,10 @@ public List<EventType> getFilter() {
      * Setter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @param filter Value for List of EventType
+     * @param filter Value for List of EventKey
      */
     @JsonSetter("filter")
-    public void setFilter(List<EventType> filter) {
+    public void setFilter(List<EventKey> filter) {
         this.filter = filter;
     }
 
@@ -380,7 +380,7 @@ public static class Builder {
         private Long sinceId;
         private Long maxId;
         private Direction direction = Direction.DESC;
-        private List<EventType> filter;
+        private List<EventKey> filter;
         private ListEventsDateField dateField;
         private String startDate;
         private String endDate;
@@ -441,10 +441,10 @@ public Builder direction(Direction direction) {
 
         /**
          * Setter for filter.
-         * @param  filter  List of EventType value for filter.
+         * @param  filter  List of EventKey value for filter.
          * @return Builder
          */
-        public Builder filter(List<EventType> filter) {
+        public Builder filter(List<EventKey> filter) {
             this.filter = filter;
             return this;
         }
diff --git a/src/main/java/com/maxio/advancedbilling/models/ListProductPricePointsInput.java b/src/main/java/com/maxio/advancedbilling/models/ListProductPricePointsInput.java
index e8b5db29..494e1e34 100644
--- a/src/main/java/com/maxio/advancedbilling/models/ListProductPricePointsInput.java
+++ b/src/main/java/com/maxio/advancedbilling/models/ListProductPricePointsInput.java
@@ -21,6 +21,7 @@ public class ListProductPricePointsInput {
     private Integer perPage;
     private Boolean currencyPrices;
     private List<PricePointType> filterType;
+    private Boolean archived;
 
     /**
      * Default constructor.
@@ -37,18 +38,21 @@ public ListProductPricePointsInput() {
      * @param  perPage  Integer value for perPage.
      * @param  currencyPrices  Boolean value for currencyPrices.
      * @param  filterType  List of PricePointType value for filterType.
+     * @param  archived  Boolean value for archived.
      */
     public ListProductPricePointsInput(
             ListProductPricePointsInputProductId productId,
             Integer page,
             Integer perPage,
             Boolean currencyPrices,
-            List<PricePointType> filterType) {
+            List<PricePointType> filterType,
+            Boolean archived) {
         this.productId = productId;
         this.page = page;
         this.perPage = perPage;
         this.currencyPrices = currencyPrices;
         this.filterType = filterType;
+        this.archived = archived;
     }
 
     /**
@@ -173,6 +177,27 @@ public void setFilterType(List<PricePointType> filterType) {
         this.filterType = filterType;
     }
 
+    /**
+     * Getter for Archived.
+     * Set to include archived price points in the response.
+     * @return Returns the Boolean
+     */
+    @JsonGetter("archived")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public Boolean getArchived() {
+        return archived;
+    }
+
+    /**
+     * Setter for Archived.
+     * Set to include archived price points in the response.
+     * @param archived Value for Boolean
+     */
+    @JsonSetter("archived")
+    public void setArchived(Boolean archived) {
+        this.archived = archived;
+    }
+
     /**
      * Converts this ListProductPricePointsInput into string format.
      * @return String representation of this class
@@ -181,7 +206,7 @@ public void setFilterType(List<PricePointType> filterType) {
     public String toString() {
         return "ListProductPricePointsInput [" + "productId=" + productId + ", page=" + page
                 + ", perPage=" + perPage + ", currencyPrices=" + currencyPrices + ", filterType="
-                + filterType + "]";
+                + filterType + ", archived=" + archived + "]";
     }
 
     /**
@@ -194,7 +219,8 @@ public Builder toBuilder() {
                 .page(getPage())
                 .perPage(getPerPage())
                 .currencyPrices(getCurrencyPrices())
-                .filterType(getFilterType());
+                .filterType(getFilterType())
+                .archived(getArchived());
         return builder;
     }
 
@@ -207,6 +233,7 @@ public static class Builder {
         private Integer perPage = 10;
         private Boolean currencyPrices;
         private List<PricePointType> filterType;
+        private Boolean archived;
 
         /**
          * Initialization constructor.
@@ -272,13 +299,23 @@ public Builder filterType(List<PricePointType> filterType) {
             return this;
         }
 
+        /**
+         * Setter for archived.
+         * @param  archived  Boolean value for archived.
+         * @return Builder
+         */
+        public Builder archived(Boolean archived) {
+            this.archived = archived;
+            return this;
+        }
+
         /**
          * Builds a new {@link ListProductPricePointsInput} object using the set fields.
          * @return {@link ListProductPricePointsInput}
          */
         public ListProductPricePointsInput build() {
             return new ListProductPricePointsInput(productId, page, perPage, currencyPrices,
-                    filterType);
+                    filterType, archived);
         }
     }
 }
diff --git a/src/main/java/com/maxio/advancedbilling/models/ListSubscriptionEventsInput.java b/src/main/java/com/maxio/advancedbilling/models/ListSubscriptionEventsInput.java
index 27d09806..e1145d59 100644
--- a/src/main/java/com/maxio/advancedbilling/models/ListSubscriptionEventsInput.java
+++ b/src/main/java/com/maxio/advancedbilling/models/ListSubscriptionEventsInput.java
@@ -21,7 +21,7 @@ public class ListSubscriptionEventsInput {
     private Long sinceId;
     private Long maxId;
     private Direction direction;
-    private List<EventType> filter;
+    private List<EventKey> filter;
 
     /**
      * Default constructor.
@@ -40,7 +40,7 @@ public ListSubscriptionEventsInput() {
      * @param  sinceId  Long value for sinceId.
      * @param  maxId  Long value for maxId.
      * @param  direction  Direction value for direction.
-     * @param  filter  List of EventType value for filter.
+     * @param  filter  List of EventKey value for filter.
      */
     public ListSubscriptionEventsInput(
             int subscriptionId,
@@ -49,7 +49,7 @@ public ListSubscriptionEventsInput(
             Long sinceId,
             Long maxId,
             Direction direction,
-            List<EventType> filter) {
+            List<EventKey> filter) {
         this.subscriptionId = subscriptionId;
         this.page = page;
         this.perPage = perPage;
@@ -200,11 +200,11 @@ public void setDirection(Direction direction) {
      * Getter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @return Returns the List of EventType
+     * @return Returns the List of EventKey
      */
     @JsonGetter("filter")
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    public List<EventType> getFilter() {
+    public List<EventKey> getFilter() {
         return filter;
     }
 
@@ -212,10 +212,10 @@ public List<EventType> getFilter() {
      * Setter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @param filter Value for List of EventType
+     * @param filter Value for List of EventKey
      */
     @JsonSetter("filter")
-    public void setFilter(List<EventType> filter) {
+    public void setFilter(List<EventKey> filter) {
         this.filter = filter;
     }
 
@@ -256,7 +256,7 @@ public static class Builder {
         private Long sinceId;
         private Long maxId;
         private Direction direction = Direction.DESC;
-        private List<EventType> filter;
+        private List<EventKey> filter;
 
         /**
          * Initialization constructor.
@@ -334,10 +334,10 @@ public Builder direction(Direction direction) {
 
         /**
          * Setter for filter.
-         * @param  filter  List of EventType value for filter.
+         * @param  filter  List of EventKey value for filter.
          * @return Builder
          */
-        public Builder filter(List<EventType> filter) {
+        public Builder filter(List<EventKey> filter) {
             this.filter = filter;
             return this;
         }
diff --git a/src/main/java/com/maxio/advancedbilling/models/ReadEventsCountInput.java b/src/main/java/com/maxio/advancedbilling/models/ReadEventsCountInput.java
index 6b893d94..2025eb08 100644
--- a/src/main/java/com/maxio/advancedbilling/models/ReadEventsCountInput.java
+++ b/src/main/java/com/maxio/advancedbilling/models/ReadEventsCountInput.java
@@ -20,7 +20,7 @@ public class ReadEventsCountInput {
     private Long sinceId;
     private Long maxId;
     private Direction direction;
-    private List<EventType> filter;
+    private List<EventKey> filter;
 
     /**
      * Default constructor.
@@ -38,7 +38,7 @@ public ReadEventsCountInput() {
      * @param  sinceId  Long value for sinceId.
      * @param  maxId  Long value for maxId.
      * @param  direction  Direction value for direction.
-     * @param  filter  List of EventType value for filter.
+     * @param  filter  List of EventKey value for filter.
      */
     public ReadEventsCountInput(
             Integer page,
@@ -46,7 +46,7 @@ public ReadEventsCountInput(
             Long sinceId,
             Long maxId,
             Direction direction,
-            List<EventType> filter) {
+            List<EventKey> filter) {
         this.page = page;
         this.perPage = perPage;
         this.sinceId = sinceId;
@@ -176,11 +176,11 @@ public void setDirection(Direction direction) {
      * Getter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @return Returns the List of EventType
+     * @return Returns the List of EventKey
      */
     @JsonGetter("filter")
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    public List<EventType> getFilter() {
+    public List<EventKey> getFilter() {
         return filter;
     }
 
@@ -188,10 +188,10 @@ public List<EventType> getFilter() {
      * Setter for Filter.
      * You can pass multiple event keys after comma. Use in query
      * `filter=signup_success,payment_success`.
-     * @param filter Value for List of EventType
+     * @param filter Value for List of EventKey
      */
     @JsonSetter("filter")
-    public void setFilter(List<EventType> filter) {
+    public void setFilter(List<EventKey> filter) {
         this.filter = filter;
     }
 
@@ -231,7 +231,7 @@ public static class Builder {
         private Long sinceId;
         private Long maxId;
         private Direction direction = Direction.DESC;
-        private List<EventType> filter;
+        private List<EventKey> filter;
 
 
 
@@ -287,10 +287,10 @@ public Builder direction(Direction direction) {
 
         /**
          * Setter for filter.
-         * @param  filter  List of EventType value for filter.
+         * @param  filter  List of EventKey value for filter.
          * @return Builder
          */
-        public Builder filter(List<EventType> filter) {
+        public Builder filter(List<EventKey> filter) {
             this.filter = filter;
             return this;
         }