diff --git a/lib/onesignal/configuration.rb b/lib/onesignal/configuration.rb
index 1ffb201..05b4f81 100644
--- a/lib/onesignal/configuration.rb
+++ b/lib/onesignal/configuration.rb
@@ -33,11 +33,10 @@ class Configuration
     # Default server operation variables
     attr_accessor :server_operation_variables
 
-    # OneSignal API token for App Authentication
-    attr_accessor :app_key
+    attr_accessor :organization_api_key
+
+    attr_accessor :rest_api_key
 
-    # OneSignal API token for User Authentication
-    attr_accessor :user_key
 
     # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response
     # details will be logged with `logger.debug` (see the `logger` attribute).
diff --git a/lib/onesignal/models/basic_notification.rb b/lib/onesignal/models/basic_notification.rb
index ce23dcd..48c1617 100644
--- a/lib/onesignal/models/basic_notification.rb
+++ b/lib/onesignal/models/basic_notification.rb
@@ -653,7 +653,9 @@ def self.openapi_nullable
         :'buttons',
         :'web_buttons',
         :'ios_category',
+        :'android_channel_id',
         :'huawei_channel_id',
+        :'existing_android_channel_id',
         :'huawei_existing_channel_id',
         :'small_icon',
         :'huawei_small_icon',
diff --git a/lib/onesignal/models/basic_notification_all_of.rb b/lib/onesignal/models/basic_notification_all_of.rb
index d1c952f..eb46fa7 100644
--- a/lib/onesignal/models/basic_notification_all_of.rb
+++ b/lib/onesignal/models/basic_notification_all_of.rb
@@ -587,7 +587,9 @@ def self.openapi_nullable
         :'buttons',
         :'web_buttons',
         :'ios_category',
+        :'android_channel_id',
         :'huawei_channel_id',
+        :'existing_android_channel_id',
         :'huawei_existing_channel_id',
         :'small_icon',
         :'huawei_small_icon',
diff --git a/lib/onesignal/models/notification.rb b/lib/onesignal/models/notification.rb
index 4982cb5..4e4e437 100644
--- a/lib/onesignal/models/notification.rb
+++ b/lib/onesignal/models/notification.rb
@@ -658,7 +658,9 @@ def self.openapi_nullable
         :'buttons',
         :'web_buttons',
         :'ios_category',
+        :'android_channel_id',
         :'huawei_channel_id',
+        :'existing_android_channel_id',
         :'huawei_existing_channel_id',
         :'small_icon',
         :'huawei_small_icon',
diff --git a/lib/onesignal/models/notification_with_meta.rb b/lib/onesignal/models/notification_with_meta.rb
index f83d490..2841afd 100644
--- a/lib/onesignal/models/notification_with_meta.rb
+++ b/lib/onesignal/models/notification_with_meta.rb
@@ -711,7 +711,9 @@ def self.openapi_nullable
         :'buttons',
         :'web_buttons',
         :'ios_category',
+        :'android_channel_id',
         :'huawei_channel_id',
+        :'existing_android_channel_id',
         :'huawei_existing_channel_id',
         :'small_icon',
         :'huawei_small_icon',