diff --git a/Analytics/OCI.PSModules.Analytics.psd1 b/Analytics/OCI.PSModules.Analytics.psd1
index 680121a8e..6fd951af2 100644
--- a/Analytics/OCI.PSModules.Analytics.psd1
+++ b/Analytics/OCI.PSModules.Analytics.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Analytics.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Analytics.dll'
diff --git a/Announcementsservice/OCI.PSModules.Announcementsservice.psd1 b/Announcementsservice/OCI.PSModules.Announcementsservice.psd1
index a55061288..9286abfdb 100644
--- a/Announcementsservice/OCI.PSModules.Announcementsservice.psd1
+++ b/Announcementsservice/OCI.PSModules.Announcementsservice.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Announcementsservice.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Announcementsservice.dll'
diff --git a/Apigateway/OCI.PSModules.Apigateway.psd1 b/Apigateway/OCI.PSModules.Apigateway.psd1
index 6b821ce9b..9b68bd668 100644
--- a/Apigateway/OCI.PSModules.Apigateway.psd1
+++ b/Apigateway/OCI.PSModules.Apigateway.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Apigateway.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Apigateway.dll'
diff --git a/Applicationmigration/OCI.PSModules.Applicationmigration.psd1 b/Applicationmigration/OCI.PSModules.Applicationmigration.psd1
index 0f8f4ebf8..3185b099f 100644
--- a/Applicationmigration/OCI.PSModules.Applicationmigration.psd1
+++ b/Applicationmigration/OCI.PSModules.Applicationmigration.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Applicationmigration.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Applicationmigration.dll'
diff --git a/Audit/OCI.PSModules.Audit.psd1 b/Audit/OCI.PSModules.Audit.psd1
index 4e0a650d0..94e81929c 100644
--- a/Audit/OCI.PSModules.Audit.psd1
+++ b/Audit/OCI.PSModules.Audit.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Audit.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Audit.dll'
diff --git a/Autoscaling/OCI.PSModules.Autoscaling.psd1 b/Autoscaling/OCI.PSModules.Autoscaling.psd1
index d3ed80d01..2fb2e84b5 100644
--- a/Autoscaling/OCI.PSModules.Autoscaling.psd1
+++ b/Autoscaling/OCI.PSModules.Autoscaling.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Autoscaling.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Autoscaling.dll'
diff --git a/Bds/OCI.PSModules.Bds.psd1 b/Bds/OCI.PSModules.Bds.psd1
index bd46ec84e..a797631cc 100644
--- a/Bds/OCI.PSModules.Bds.psd1
+++ b/Bds/OCI.PSModules.Bds.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Bds.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Bds.dll'
diff --git a/Blockchain/OCI.PSModules.Blockchain.psd1 b/Blockchain/OCI.PSModules.Blockchain.psd1
index 35d3c9b6c..70aa716a3 100644
--- a/Blockchain/OCI.PSModules.Blockchain.psd1
+++ b/Blockchain/OCI.PSModules.Blockchain.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Blockchain.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Blockchain.dll'
diff --git a/Budget/OCI.PSModules.Budget.psd1 b/Budget/OCI.PSModules.Budget.psd1
index 303ec11e9..ee01594b5 100644
--- a/Budget/OCI.PSModules.Budget.psd1
+++ b/Budget/OCI.PSModules.Budget.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Budget.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Budget.dll'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f83e083a..6facdd1fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a [Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 8.0.0 - 2021-02-02
+### Added
+- Support for checking if a contact for Exadata infrastructure is valid in My Oracle Support in the Database service.
+- Support for checking if Exadata infrastructure is in a degraded state in the Database service.
+- Support for updating the operating system on a VM cluster in the Database service.
+- Support for external databases in the Database service.
+- Support for uploading objects to the infrequent access storage tier in the Object Storage service.
+- Support for changing the storage tier of existing objects in the Object Storage service.
+- Support for private templates in the Resource Manager service.
+- Support for multiple encryption domains on IPSec tunnels in the Networking service.
+
+### Breaking Changes
+- `ListAppCatalogListingResourceVersionsResponse` in `Get-OCIComputeAppCatalogListingResourceVersionsList` no longer supports the `etag` parameter.
+- Property `vnicId` in model `Oci.CoreService.Models.Ipv6` was removed as a parameter from the Core service.
+- `ArchivalStateEnum` enum was replaced by `ArchivalState` in response `GetObjectResponse` in cmdlet `Get-OCIObjectStorageObject` in the Object Storage Service.
+
 ## 7.0.0 - 2021-01-26
 ### Added
 - Support for creating, managing, and using asymmetric keys in the Key Management service.
diff --git a/Cims/OCI.PSModules.Cims.psd1 b/Cims/OCI.PSModules.Cims.psd1
index f53ac6d27..ab1af0fe6 100644
--- a/Cims/OCI.PSModules.Cims.psd1
+++ b/Cims/OCI.PSModules.Cims.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Cims.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Cims.dll'
diff --git a/Cloudguard/OCI.PSModules.Cloudguard.psd1 b/Cloudguard/OCI.PSModules.Cloudguard.psd1
index d0bd30825..a86a096f6 100644
--- a/Cloudguard/OCI.PSModules.Cloudguard.psd1
+++ b/Cloudguard/OCI.PSModules.Cloudguard.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Cloudguard.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Cloudguard.dll'
diff --git a/Common/OCI.PSModules.Common.psd1 b/Common/OCI.PSModules.Common.psd1
index 2a6685ce8..5cc9869e2 100644
--- a/Common/OCI.PSModules.Common.psd1
+++ b/Common/OCI.PSModules.Common.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Common.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
diff --git a/Common/Version.cs b/Common/Version.cs
index bee8794c0..0cf4be75a 100644
--- a/Common/Version.cs
+++ b/Common/Version.cs
@@ -6,7 +6,7 @@ namespace Oci.PSModules.Common.Cmdlets
 {
     public class Version
     {
-        public static string MAJOR = "7";
+        public static string MAJOR = "8";
         public static string MINOR = "0";
         public static string PATCH = "0";
 
diff --git a/Computeinstanceagent/OCI.PSModules.Computeinstanceagent.psd1 b/Computeinstanceagent/OCI.PSModules.Computeinstanceagent.psd1
index 914bcf94f..e09f1359e 100644
--- a/Computeinstanceagent/OCI.PSModules.Computeinstanceagent.psd1
+++ b/Computeinstanceagent/OCI.PSModules.Computeinstanceagent.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Computeinstanceagent.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Computeinstanceagent.dll'
diff --git a/Containerengine/OCI.PSModules.Containerengine.psd1 b/Containerengine/OCI.PSModules.Containerengine.psd1
index ff7f1494a..5791d156b 100644
--- a/Containerengine/OCI.PSModules.Containerengine.psd1
+++ b/Containerengine/OCI.PSModules.Containerengine.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Containerengine.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Containerengine.dll'
diff --git a/Core/Cmdlets/Add-OCIVirtualNetworkVcnCidr.cs b/Core/Cmdlets/Add-OCIVirtualNetworkVcnCidr.cs
index a9e18f79c..217df1dd3 100644
--- a/Core/Cmdlets/Add-OCIVirtualNetworkVcnCidr.cs
+++ b/Core/Cmdlets/Add-OCIVirtualNetworkVcnCidr.cs
@@ -40,8 +40,8 @@ public class AddOCIVirtualNetworkVcnCidr : OCIVirtualNetworkCmdlet
         public string OpcRetryToken { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
diff --git a/Core/Cmdlets/DisMount-OCIComputeBootVolume.cs b/Core/Cmdlets/DisMount-OCIComputeBootVolume.cs
index b823f406b..8ea8a8f9d 100644
--- a/Core/Cmdlets/DisMount-OCIComputeBootVolume.cs
+++ b/Core/Cmdlets/DisMount-OCIComputeBootVolume.cs
@@ -21,7 +21,7 @@ public class DisMountOCIComputeBootVolume : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the boot volume attachment.")]
         public string BootVolumeAttachmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/DisMount-OCIComputeManagementLoadBalancer.cs b/Core/Cmdlets/DisMount-OCIComputeManagementLoadBalancer.cs
index aad3a9d66..47530df18 100644
--- a/Core/Cmdlets/DisMount-OCIComputeManagementLoadBalancer.cs
+++ b/Core/Cmdlets/DisMount-OCIComputeManagementLoadBalancer.cs
@@ -27,7 +27,7 @@ public class DisMountOCIComputeManagementLoadBalancer : OCIComputeManagementCmdl
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/DisMount-OCIComputeVnic.cs b/Core/Cmdlets/DisMount-OCIComputeVnic.cs
index 9639dc9c7..1589df918 100644
--- a/Core/Cmdlets/DisMount-OCIComputeVnic.cs
+++ b/Core/Cmdlets/DisMount-OCIComputeVnic.cs
@@ -21,7 +21,7 @@ public class DisMountOCIComputeVnic : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the VNIC attachment.")]
         public string VnicAttachmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/DisMount-OCIComputeVolume.cs b/Core/Cmdlets/DisMount-OCIComputeVolume.cs
index 0c090da17..0e41cf357 100644
--- a/Core/Cmdlets/DisMount-OCIComputeVolume.cs
+++ b/Core/Cmdlets/DisMount-OCIComputeVolume.cs
@@ -21,7 +21,7 @@ public class DisMountOCIComputeVolume : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume attachment.")]
         public string VolumeAttachmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/DisMount-OCIVirtualNetworkServiceId.cs b/Core/Cmdlets/DisMount-OCIVirtualNetworkServiceId.cs
index b729872ed..71867a4fe 100644
--- a/Core/Cmdlets/DisMount-OCIVirtualNetworkServiceId.cs
+++ b/Core/Cmdlets/DisMount-OCIVirtualNetworkServiceId.cs
@@ -24,7 +24,7 @@ public class DisMountOCIVirtualNetworkServiceId : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"ServiceId of Service to be detached from a service gateway.")]
         public ServiceIdRequestDetails DetachServiceDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Edit-OCIVirtualNetworkVcnCidr.cs b/Core/Cmdlets/Edit-OCIVirtualNetworkVcnCidr.cs
index 336998a84..dc2954078 100644
--- a/Core/Cmdlets/Edit-OCIVirtualNetworkVcnCidr.cs
+++ b/Core/Cmdlets/Edit-OCIVirtualNetworkVcnCidr.cs
@@ -40,8 +40,8 @@ public class EditOCIVirtualNetworkVcnCidr : OCIVirtualNetworkCmdlet
         public string OpcRetryToken { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
diff --git a/Core/Cmdlets/Export-OCIComputeImage.cs b/Core/Cmdlets/Export-OCIComputeImage.cs
index ddf24c3e7..76fdadb36 100644
--- a/Core/Cmdlets/Export-OCIComputeImage.cs
+++ b/Core/Cmdlets/Export-OCIComputeImage.cs
@@ -35,8 +35,8 @@ public class ExportOCIComputeImage : OCIComputeCmdlet
         public string OpcRetryToken { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
diff --git a/Core/Cmdlets/Get-OCIBlockstorageBootVolumeBackupsList.cs b/Core/Cmdlets/Get-OCIBlockstorageBootVolumeBackupsList.cs
index 63bc45265..903b1cb7c 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageBootVolumeBackupsList.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageBootVolumeBackupsList.cs
@@ -48,7 +48,7 @@ public class GetOCIBlockstorageBootVolumeBackupsList : OCIBlockstorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListBootVolumeBackupsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.BootVolumeBackup.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIBlockstorageBootVolumeKmsKey.cs b/Core/Cmdlets/Get-OCIBlockstorageBootVolumeKmsKey.cs
index a03331935..7bdfee4a1 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageBootVolumeKmsKey.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageBootVolumeKmsKey.cs
@@ -21,7 +21,7 @@ public class GetOCIBlockstorageBootVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the boot volume.")]
         public string BootVolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Get-OCIBlockstorageVolumeBackupsList.cs b/Core/Cmdlets/Get-OCIBlockstorageVolumeBackupsList.cs
index 376f8593e..345534d68 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageVolumeBackupsList.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageVolumeBackupsList.cs
@@ -48,7 +48,7 @@ public class GetOCIBlockstorageVolumeBackupsList : OCIBlockstorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListVolumeBackupsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.VolumeBackup.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIBlockstorageVolumeGroupsList.cs b/Core/Cmdlets/Get-OCIBlockstorageVolumeGroupsList.cs
index a5f3ac0cc..32f05c3ed 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageVolumeGroupsList.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageVolumeGroupsList.cs
@@ -47,7 +47,7 @@ public class GetOCIBlockstorageVolumeGroupsList : OCIBlockstorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListVolumeGroupsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.VolumeGroup.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIBlockstorageVolumeKmsKey.cs b/Core/Cmdlets/Get-OCIBlockstorageVolumeKmsKey.cs
index be0f32f35..aa2fa0ef5 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageVolumeKmsKey.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageVolumeKmsKey.cs
@@ -21,7 +21,7 @@ public class GetOCIBlockstorageVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume.")]
         public string VolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Get-OCIBlockstorageVolumesList.cs b/Core/Cmdlets/Get-OCIBlockstorageVolumesList.cs
index 9877b3257..e181fbf39 100644
--- a/Core/Cmdlets/Get-OCIBlockstorageVolumesList.cs
+++ b/Core/Cmdlets/Get-OCIBlockstorageVolumesList.cs
@@ -50,7 +50,7 @@ public class GetOCIBlockstorageVolumesList : OCIBlockstorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume group.")]
         public string VolumeGroupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.Volume.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIComputeConsoleHistoriesList.cs b/Core/Cmdlets/Get-OCIComputeConsoleHistoriesList.cs
index 70fb05d82..576d9ec5e 100644
--- a/Core/Cmdlets/Get-OCIComputeConsoleHistoriesList.cs
+++ b/Core/Cmdlets/Get-OCIComputeConsoleHistoriesList.cs
@@ -47,7 +47,7 @@ public class GetOCIComputeConsoleHistoriesList : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListConsoleHistoriesRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.ConsoleHistory.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIComputeImagesList.cs b/Core/Cmdlets/Get-OCIComputeImagesList.cs
index 5b6c67649..051f4dbbb 100644
--- a/Core/Cmdlets/Get-OCIComputeImagesList.cs
+++ b/Core/Cmdlets/Get-OCIComputeImagesList.cs
@@ -55,7 +55,7 @@ public class GetOCIComputeImagesList : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListImagesRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.Image.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIComputeInstancesList.cs b/Core/Cmdlets/Get-OCIComputeInstancesList.cs
index 63bffb7e9..1a81eca65 100644
--- a/Core/Cmdlets/Get-OCIComputeInstancesList.cs
+++ b/Core/Cmdlets/Get-OCIComputeInstancesList.cs
@@ -47,7 +47,7 @@ public class GetOCIComputeInstancesList : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListInstancesRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.Instance.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIComputeManagementInstancePoolsList.cs b/Core/Cmdlets/Get-OCIComputeManagementInstancePoolsList.cs
index 190701ee5..654801623 100644
--- a/Core/Cmdlets/Get-OCIComputeManagementInstancePoolsList.cs
+++ b/Core/Cmdlets/Get-OCIComputeManagementInstancePoolsList.cs
@@ -42,7 +42,7 @@ public class GetOCIComputeManagementInstancePoolsList : OCIComputeManagementCmdl
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListInstancePoolsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.InstancePoolSummary.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkDhcpOptionsList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkDhcpOptionsList.cs
index ca86a0a15..c4de2b3f8 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkDhcpOptionsList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkDhcpOptionsList.cs
@@ -45,7 +45,7 @@ public class GetOCIVirtualNetworkDhcpOptionsList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListDhcpOptionsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.DhcpOptions.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkInternetGatewaysList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkInternetGatewaysList.cs
index 1030837db..5258af1ca 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkInternetGatewaysList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkInternetGatewaysList.cs
@@ -45,7 +45,7 @@ public class GetOCIVirtualNetworkInternetGatewaysList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListInternetGatewaysRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.InternetGateway.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkRouteTablesList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkRouteTablesList.cs
index 9d6f64b06..45b607ad8 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkRouteTablesList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkRouteTablesList.cs
@@ -45,7 +45,7 @@ public class GetOCIVirtualNetworkRouteTablesList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListRouteTablesRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.RouteTable.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkSecurityListsList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkSecurityListsList.cs
index ac76e16ff..4d9a74fd3 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkSecurityListsList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkSecurityListsList.cs
@@ -45,7 +45,7 @@ public class GetOCIVirtualNetworkSecurityListsList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListSecurityListsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.SecurityList.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkServiceGatewaysList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkServiceGatewaysList.cs
index b0b208093..7745db1c1 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkServiceGatewaysList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkServiceGatewaysList.cs
@@ -42,7 +42,7 @@ public class GetOCIVirtualNetworkServiceGatewaysList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListServiceGatewaysRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.ServiceGateway.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkVcnsList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkVcnsList.cs
index cb67d18ab..961769597 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkVcnsList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkVcnsList.cs
@@ -42,7 +42,7 @@ public class GetOCIVirtualNetworkVcnsList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order is case sensitive.")]
         public System.Nullable<Oci.CoreService.Requests.ListVcnsRequest.SortOrderEnum> SortOrder { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.Vcn.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkVirtualCircuitPublicPrefixesList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkVirtualCircuitPublicPrefixesList.cs
index a9e82a525..826cd659b 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkVirtualCircuitPublicPrefixesList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkVirtualCircuitPublicPrefixesList.cs
@@ -21,7 +21,9 @@ public class GetOCIVirtualNetworkVirtualCircuitPublicPrefixesList : OCIVirtualNe
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the virtual circuit.")]
         public string VirtualCircuitId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given verification state. The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given verification state.
+
+The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.VirtualCircuitPublicPrefix.VerificationStateEnum> VerificationState { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Get-OCIVirtualNetworkVlansList.cs b/Core/Cmdlets/Get-OCIVirtualNetworkVlansList.cs
index 17b1c30b4..fa0b74d5e 100644
--- a/Core/Cmdlets/Get-OCIVirtualNetworkVlansList.cs
+++ b/Core/Cmdlets/Get-OCIVirtualNetworkVlansList.cs
@@ -48,7 +48,7 @@ public class GetOCIVirtualNetworkVlansList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.")]
         public System.Nullable<Oci.CoreService.Models.Vlan.LifecycleStateEnum> LifecycleState { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Core/Cmdlets/Invoke-OCIComputeInstanceAction.cs b/Core/Cmdlets/Invoke-OCIComputeInstanceAction.cs
index d66276af8..65516a647 100644
--- a/Core/Cmdlets/Invoke-OCIComputeInstanceAction.cs
+++ b/Core/Cmdlets/Invoke-OCIComputeInstanceAction.cs
@@ -27,7 +27,7 @@ public class InvokeOCIComputeInstanceAction : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Invoke-OCIComputeManagementSoftresetInstancePool.cs b/Core/Cmdlets/Invoke-OCIComputeManagementSoftresetInstancePool.cs
index 8516442fa..76079cece 100644
--- a/Core/Cmdlets/Invoke-OCIComputeManagementSoftresetInstancePool.cs
+++ b/Core/Cmdlets/Invoke-OCIComputeManagementSoftresetInstancePool.cs
@@ -24,7 +24,7 @@ public class InvokeOCIComputeManagementSoftresetInstancePool : OCIComputeManagem
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Invoke-OCIComputeManagementTerminateClusterNetwork.cs b/Core/Cmdlets/Invoke-OCIComputeManagementTerminateClusterNetwork.cs
index 19d685fe3..9a6918146 100644
--- a/Core/Cmdlets/Invoke-OCIComputeManagementTerminateClusterNetwork.cs
+++ b/Core/Cmdlets/Invoke-OCIComputeManagementTerminateClusterNetwork.cs
@@ -25,8 +25,8 @@ public class InvokeOCIComputeManagementTerminateClusterNetwork : OCIComputeManag
         public string ClusterNetworkId { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Invoke-OCIComputeManagementTerminateInstancePool.cs b/Core/Cmdlets/Invoke-OCIComputeManagementTerminateInstancePool.cs
index 03555493b..7ff194239 100644
--- a/Core/Cmdlets/Invoke-OCIComputeManagementTerminateInstancePool.cs
+++ b/Core/Cmdlets/Invoke-OCIComputeManagementTerminateInstancePool.cs
@@ -21,7 +21,7 @@ public class InvokeOCIComputeManagementTerminateInstancePool : OCIComputeManagem
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the instance pool.")]
         public string InstancePoolId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Invoke-OCIComputeTerminateInstance.cs b/Core/Cmdlets/Invoke-OCIComputeTerminateInstance.cs
index 79fa55910..6833be704 100644
--- a/Core/Cmdlets/Invoke-OCIComputeTerminateInstance.cs
+++ b/Core/Cmdlets/Invoke-OCIComputeTerminateInstance.cs
@@ -21,7 +21,7 @@ public class InvokeOCIComputeTerminateInstance : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the instance.")]
         public string InstanceId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Specifies whether to delete or preserve the boot volume when terminating an instance. The default value is false.")]
diff --git a/Core/Cmdlets/Mount-OCIComputeManagementLoadBalancer.cs b/Core/Cmdlets/Mount-OCIComputeManagementLoadBalancer.cs
index b3fa9e3b7..eeccd4963 100644
--- a/Core/Cmdlets/Mount-OCIComputeManagementLoadBalancer.cs
+++ b/Core/Cmdlets/Mount-OCIComputeManagementLoadBalancer.cs
@@ -27,7 +27,7 @@ public class MountOCIComputeManagementLoadBalancer : OCIComputeManagementCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Mount-OCIVirtualNetworkServiceId.cs b/Core/Cmdlets/Mount-OCIVirtualNetworkServiceId.cs
index f67c6cf76..324ffeb2b 100644
--- a/Core/Cmdlets/Mount-OCIVirtualNetworkServiceId.cs
+++ b/Core/Cmdlets/Mount-OCIVirtualNetworkServiceId.cs
@@ -24,7 +24,7 @@ public class MountOCIVirtualNetworkServiceId : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"ServiceId of Service to be attached to a service gateway.")]
         public ServiceIdRequestDetails AttachServiceDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Move-OCIComputeDedicatedVmHostCompartment.cs b/Core/Cmdlets/Move-OCIComputeDedicatedVmHostCompartment.cs
index c78391c65..aed6c5a5e 100644
--- a/Core/Cmdlets/Move-OCIComputeDedicatedVmHostCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeDedicatedVmHostCompartment.cs
@@ -30,8 +30,8 @@ public class MoveOCIComputeDedicatedVmHostCompartment : OCIComputeCmdlet
         public ChangeDedicatedVmHostCompartmentDetails ChangeDedicatedVmHostCompartmentDetails { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         
diff --git a/Core/Cmdlets/Move-OCIComputeImageCapabilitySchemaCompartment.cs b/Core/Cmdlets/Move-OCIComputeImageCapabilitySchemaCompartment.cs
index 48d00ef99..b49ba2997 100644
--- a/Core/Cmdlets/Move-OCIComputeImageCapabilitySchemaCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeImageCapabilitySchemaCompartment.cs
@@ -24,7 +24,7 @@ public class MoveOCIComputeImageCapabilitySchemaCompartment : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Compute Image Capability Schema change compartment details")]
         public ChangeComputeImageCapabilitySchemaCompartmentDetails ChangeComputeImageCapabilitySchemaCompartmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Move-OCIComputeImageCompartment.cs b/Core/Cmdlets/Move-OCIComputeImageCompartment.cs
index 1a51051ed..792886bea 100644
--- a/Core/Cmdlets/Move-OCIComputeImageCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeImageCompartment.cs
@@ -24,7 +24,7 @@ public class MoveOCIComputeImageCompartment : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to change the compartment of a given image.")]
         public ChangeImageCompartmentDetails ChangeImageCompartmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Move-OCIComputeInstanceCompartment.cs b/Core/Cmdlets/Move-OCIComputeInstanceCompartment.cs
index 70292daf7..8386ab110 100644
--- a/Core/Cmdlets/Move-OCIComputeInstanceCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeInstanceCompartment.cs
@@ -30,8 +30,8 @@ public class MoveOCIComputeInstanceCompartment : OCIComputeCmdlet
         public ChangeInstanceCompartmentDetails ChangeInstanceCompartmentDetails { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         
diff --git a/Core/Cmdlets/Move-OCIComputeManagementClusterNetworkCompartment.cs b/Core/Cmdlets/Move-OCIComputeManagementClusterNetworkCompartment.cs
index 482f6c3e6..3416ca178 100644
--- a/Core/Cmdlets/Move-OCIComputeManagementClusterNetworkCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeManagementClusterNetworkCompartment.cs
@@ -24,7 +24,7 @@ public class MoveOCIComputeManagementClusterNetworkCompartment : OCIComputeManag
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to change the compartment of given cluster network.")]
         public ChangeClusterNetworkCompartmentDetails ChangeClusterNetworkCompartmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Move-OCIComputeManagementInstanceConfigurationCompartment.cs b/Core/Cmdlets/Move-OCIComputeManagementInstanceConfigurationCompartment.cs
index 67eb998e7..18394ebe8 100644
--- a/Core/Cmdlets/Move-OCIComputeManagementInstanceConfigurationCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeManagementInstanceConfigurationCompartment.cs
@@ -24,7 +24,7 @@ public class MoveOCIComputeManagementInstanceConfigurationCompartment : OCICompu
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to change the compartment of given instance configuration.")]
         public ChangeInstanceConfigurationCompartmentDetails ChangeInstanceConfigurationCompartmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Move-OCIComputeManagementInstancePoolCompartment.cs b/Core/Cmdlets/Move-OCIComputeManagementInstancePoolCompartment.cs
index 50ab38cdc..024cba535 100644
--- a/Core/Cmdlets/Move-OCIComputeManagementInstancePoolCompartment.cs
+++ b/Core/Cmdlets/Move-OCIComputeManagementInstancePoolCompartment.cs
@@ -24,7 +24,7 @@ public class MoveOCIComputeManagementInstancePoolCompartment : OCIComputeManagem
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to change the compartment of given instance pool.")]
         public ChangeInstancePoolCompartmentDetails ChangeInstancePoolCompartmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Move-OCIVirtualNetworkVlanCompartment.cs b/Core/Cmdlets/Move-OCIVirtualNetworkVlanCompartment.cs
index 22f060c15..b367e8aa1 100644
--- a/Core/Cmdlets/Move-OCIVirtualNetworkVlanCompartment.cs
+++ b/Core/Cmdlets/Move-OCIVirtualNetworkVlanCompartment.cs
@@ -30,8 +30,8 @@ public class MoveOCIVirtualNetworkVlanCompartment : OCIVirtualNetworkCmdlet
         public ChangeVlanCompartmentDetails ChangeVlanCompartmentDetails { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageBootVolume.cs b/Core/Cmdlets/Remove-OCIBlockstorageBootVolume.cs
index 91e108bcb..93a519949 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageBootVolume.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageBootVolume.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageBootVolume : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the boot volume.")]
         public string BootVolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeBackup.cs b/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeBackup.cs
index 1f7a5a5e4..310e017b1 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeBackup.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeBackup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageBootVolumeBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the boot volume backup.")]
         public string BootVolumeBackupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeKmsKey.cs b/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeKmsKey.cs
index 077b5ad83..07f400a54 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeKmsKey.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageBootVolumeKmsKey.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageBootVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the boot volume.")]
         public string BootVolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolume.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolume.cs
index 6e69a1cfa..9cb1c57ce 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolume.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolume.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolume : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume.")]
         public string VolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackup.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackup.cs
index fcf2f7901..113a54c4e 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackup.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolumeBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume backup.")]
         public string VolumeBackupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicy.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicy.cs
index b442abe6a..f9116513a 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicy.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicy.cs
@@ -24,7 +24,7 @@ public class RemoveOCIBlockstorageVolumeBackupPolicy : OCIBlockstorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicyAssignment.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicyAssignment.cs
index ad6dde987..196fb339c 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicyAssignment.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeBackupPolicyAssignment.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolumeBackupPolicyAssignment : OCIBlockstorage
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume backup policy assignment.")]
         public string PolicyAssignmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroup.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroup.cs
index dd98c9ba1..f64d5af3a 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroup.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolumeGroup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The Oracle Cloud ID (OCID) that uniquely identifies the volume group.")]
         public string VolumeGroupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroupBackup.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroupBackup.cs
index 167cf9278..e00997d78 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroupBackup.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeGroupBackup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolumeGroupBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The Oracle Cloud ID (OCID) that uniquely identifies the volume group backup.")]
         public string VolumeGroupBackupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIBlockstorageVolumeKmsKey.cs b/Core/Cmdlets/Remove-OCIBlockstorageVolumeKmsKey.cs
index a3e54f104..ba566fe94 100644
--- a/Core/Cmdlets/Remove-OCIBlockstorageVolumeKmsKey.cs
+++ b/Core/Cmdlets/Remove-OCIBlockstorageVolumeKmsKey.cs
@@ -21,7 +21,7 @@ public class RemoveOCIBlockstorageVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the volume.")]
         public string VolumeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIComputeConsoleHistory.cs b/Core/Cmdlets/Remove-OCIComputeConsoleHistory.cs
index cc4699515..03a722cfe 100644
--- a/Core/Cmdlets/Remove-OCIComputeConsoleHistory.cs
+++ b/Core/Cmdlets/Remove-OCIComputeConsoleHistory.cs
@@ -21,7 +21,7 @@ public class RemoveOCIComputeConsoleHistory : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the console history.")]
         public string InstanceConsoleHistoryId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIComputeImage.cs b/Core/Cmdlets/Remove-OCIComputeImage.cs
index f0adf2f93..e003ca6d5 100644
--- a/Core/Cmdlets/Remove-OCIComputeImage.cs
+++ b/Core/Cmdlets/Remove-OCIComputeImage.cs
@@ -21,7 +21,7 @@ public class RemoveOCIComputeImage : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the image.")]
         public string ImageId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIComputeImageCapabilitySchema.cs b/Core/Cmdlets/Remove-OCIComputeImageCapabilitySchema.cs
index cfcbc4469..c843761ce 100644
--- a/Core/Cmdlets/Remove-OCIComputeImageCapabilitySchema.cs
+++ b/Core/Cmdlets/Remove-OCIComputeImageCapabilitySchema.cs
@@ -21,7 +21,7 @@ public class RemoveOCIComputeImageCapabilitySchema : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The id of the compute image capability schema or the image ocid")]
         public string ComputeImageCapabilitySchemaId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIComputeInstanceConsoleConnection.cs b/Core/Cmdlets/Remove-OCIComputeInstanceConsoleConnection.cs
index 558962a0d..3720fea68 100644
--- a/Core/Cmdlets/Remove-OCIComputeInstanceConsoleConnection.cs
+++ b/Core/Cmdlets/Remove-OCIComputeInstanceConsoleConnection.cs
@@ -21,7 +21,7 @@ public class RemoveOCIComputeInstanceConsoleConnection : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the instance console connection.")]
         public string InstanceConsoleConnectionId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIComputeManagementInstanceConfiguration.cs b/Core/Cmdlets/Remove-OCIComputeManagementInstanceConfiguration.cs
index 47555b469..38cca59c3 100644
--- a/Core/Cmdlets/Remove-OCIComputeManagementInstanceConfiguration.cs
+++ b/Core/Cmdlets/Remove-OCIComputeManagementInstanceConfiguration.cs
@@ -21,7 +21,7 @@ public class RemoveOCIComputeManagementInstanceConfiguration : OCIComputeManagem
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the instance configuration.")]
         public string InstanceConfigurationId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkByoipRange.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkByoipRange.cs
index fdfbc10fd..103da9351 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkByoipRange.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkByoipRange.cs
@@ -30,8 +30,8 @@ public class RemoveOCIVirtualNetworkByoipRange : OCIVirtualNetworkCmdlet
         public string OpcRequestId { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkCpe.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkCpe.cs
index 589884dec..70e0668fa 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkCpe.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkCpe.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkCpe : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the CPE.")]
         public string CpeId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnect.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnect.cs
index 4a9d8ecab..d7507e8a9 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnect.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnect.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkCrossConnect : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the cross-connect.")]
         public string CrossConnectId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnectGroup.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnectGroup.cs
index ccbafdb77..39a557e1e 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnectGroup.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkCrossConnectGroup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkCrossConnectGroup : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the cross-connect group.")]
         public string CrossConnectGroupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkDhcpOptions.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkDhcpOptions.cs
index 8dfe6fd93..93e3fdc70 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkDhcpOptions.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkDhcpOptions.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkDhcpOptions : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID for the set of DHCP options.")]
         public string DhcpId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkDrg.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkDrg.cs
index 4dff0baf9..dd728b50d 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkDrg.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkDrg.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkDrg : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the DRG.")]
         public string DrgId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkDrgAttachment.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkDrgAttachment.cs
index 50330afb2..28eebf79e 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkDrgAttachment.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkDrgAttachment.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkDrgAttachment : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the DRG attachment.")]
         public string DrgAttachmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkIPSecConnection.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkIPSecConnection.cs
index d2f73428e..cd90ed26d 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkIPSecConnection.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkIPSecConnection.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkIPSecConnection : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the IPSec connection.")]
         public string IpscId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkInternetGateway.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkInternetGateway.cs
index cf687dd88..8d94f36ed 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkInternetGateway.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkInternetGateway.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkInternetGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the internet gateway.")]
         public string IgId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkIpv6.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkIpv6.cs
index a3cd3ca51..3361bb540 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkIpv6.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkIpv6.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkIpv6 : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the IPv6.")]
         public string Ipv6Id { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkLocalPeeringGateway.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkLocalPeeringGateway.cs
index 8165caa25..a242b6252 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkLocalPeeringGateway.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkLocalPeeringGateway.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkLocalPeeringGateway : OCIVirtualNetworkCmdle
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the local peering gateway.")]
         public string LocalPeeringGatewayId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkNatGateway.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkNatGateway.cs
index 9680edf6a..f27d0e377 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkNatGateway.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkNatGateway.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkNatGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The NAT gateway's [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
         public string NatGatewayId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkNetworkSecurityGroup.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkNetworkSecurityGroup.cs
index 82298c3b7..0c8c17c8d 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkNetworkSecurityGroup.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkNetworkSecurityGroup.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkNetworkSecurityGroup : OCIVirtualNetworkCmdl
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the network security group.")]
         public string NetworkSecurityGroupId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkPrivateIp.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkPrivateIp.cs
index 5a67a7d37..b5ebf5523 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkPrivateIp.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkPrivateIp.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkPrivateIp : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the private IP.")]
         public string PrivateIpId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIp.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIp.cs
index aeeb8259a..11d56c08f 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIp.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIp.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkPublicIp : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the public IP.")]
         public string PublicIpId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIpPool.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIpPool.cs
index 806e627bc..a289c2237 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIpPool.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkPublicIpPool.cs
@@ -24,7 +24,7 @@ public class RemoveOCIVirtualNetworkPublicIpPool : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkRemotePeeringConnection.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkRemotePeeringConnection.cs
index 6ac69956b..34c8768c2 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkRemotePeeringConnection.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkRemotePeeringConnection.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkRemotePeeringConnection : OCIVirtualNetworkC
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the remote peering connection (RPC).")]
         public string RemotePeeringConnectionId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkRouteTable.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkRouteTable.cs
index c97b00ecd..c4a14fde1 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkRouteTable.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkRouteTable.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkRouteTable : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the route table.")]
         public string RtId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkSecurityList.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkSecurityList.cs
index 814f98a0f..0bc1aca28 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkSecurityList.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkSecurityList.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkSecurityList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the security list.")]
         public string SecurityListId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkServiceGateway.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkServiceGateway.cs
index c65ae543d..cc729675f 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkServiceGateway.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkServiceGateway.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkServiceGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The service gateway's [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
         public string ServiceGatewayId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkSubnet.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkSubnet.cs
index d69422f82..17c4e8f46 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkSubnet.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkSubnet.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkSubnet : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the subnet.")]
         public string SubnetId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkVcn.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkVcn.cs
index cc7ab593a..613b54b42 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkVcn.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkVcn.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkVcn : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the VCN.")]
         public string VcnId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkVcnCidr.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkVcnCidr.cs
index 6e2ce3033..9d057eeac 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkVcnCidr.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkVcnCidr.cs
@@ -40,8 +40,8 @@ public class RemoveOCIVirtualNetworkVcnCidr : OCIVirtualNetworkCmdlet
         public string OpcRetryToken { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkVirtualCircuit.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkVirtualCircuit.cs
index 05845d7b8..2ee3c3094 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkVirtualCircuit.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkVirtualCircuit.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkVirtualCircuit : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The OCID of the virtual circuit.")]
         public string VirtualCircuitId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Core/Cmdlets/Remove-OCIVirtualNetworkVlan.cs b/Core/Cmdlets/Remove-OCIVirtualNetworkVlan.cs
index 544ff807b..924ccd313 100644
--- a/Core/Cmdlets/Remove-OCIVirtualNetworkVlan.cs
+++ b/Core/Cmdlets/Remove-OCIVirtualNetworkVlan.cs
@@ -21,7 +21,7 @@ public class RemoveOCIVirtualNetworkVlan : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the VLAN.")]
         public string VlanId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Reset-OCIComputeManagementInstancePool.cs b/Core/Cmdlets/Reset-OCIComputeManagementInstancePool.cs
index aa78bb0e8..f50f55860 100644
--- a/Core/Cmdlets/Reset-OCIComputeManagementInstancePool.cs
+++ b/Core/Cmdlets/Reset-OCIComputeManagementInstancePool.cs
@@ -24,7 +24,7 @@ public class ResetOCIComputeManagementInstancePool : OCIComputeManagementCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Start-OCIComputeManagementInstancePool.cs b/Core/Cmdlets/Start-OCIComputeManagementInstancePool.cs
index 3cfe80b94..ec9102b3f 100644
--- a/Core/Cmdlets/Start-OCIComputeManagementInstancePool.cs
+++ b/Core/Cmdlets/Start-OCIComputeManagementInstancePool.cs
@@ -24,7 +24,7 @@ public class StartOCIComputeManagementInstancePool : OCIComputeManagementCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Stop-OCIComputeManagementInstancePool.cs b/Core/Cmdlets/Stop-OCIComputeManagementInstancePool.cs
index ccde499ad..6993ad78d 100644
--- a/Core/Cmdlets/Stop-OCIComputeManagementInstancePool.cs
+++ b/Core/Cmdlets/Stop-OCIComputeManagementInstancePool.cs
@@ -24,7 +24,7 @@ public class StopOCIComputeManagementInstancePool : OCIComputeManagementCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageBootVolume.cs b/Core/Cmdlets/Update-OCIBlockstorageBootVolume.cs
index c96cd2bbe..3a5e66ff3 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageBootVolume.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageBootVolume.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageBootVolume : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update boot volume's display name.")]
         public UpdateBootVolumeDetails UpdateBootVolumeDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageBootVolumeBackup.cs b/Core/Cmdlets/Update-OCIBlockstorageBootVolumeBackup.cs
index 2c30aa31d..ac0aa10c5 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageBootVolumeBackup.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageBootVolumeBackup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageBootVolumeBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update boot volume backup fields")]
         public UpdateBootVolumeBackupDetails UpdateBootVolumeBackupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageBootVolumeKmsKey.cs b/Core/Cmdlets/Update-OCIBlockstorageBootVolumeKmsKey.cs
index f0c01c261..32e12b5b2 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageBootVolumeKmsKey.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageBootVolumeKmsKey.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageBootVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Updates the Key Management master encryption key assigned to the specified boot volume.")]
         public UpdateBootVolumeKmsKeyDetails UpdateBootVolumeKmsKeyDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolume.cs b/Core/Cmdlets/Update-OCIBlockstorageVolume.cs
index 8ee108fa9..d1a7db49d 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolume.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolume.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolume : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update volume's display name. Avoid entering confidential information.")]
         public UpdateVolumeDetails UpdateVolumeDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolumeBackup.cs b/Core/Cmdlets/Update-OCIBlockstorageVolumeBackup.cs
index 7fe507763..1c66a430a 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolumeBackup.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolumeBackup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolumeBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update volume backup fields")]
         public UpdateVolumeBackupDetails UpdateVolumeBackupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolumeBackupPolicy.cs b/Core/Cmdlets/Update-OCIBlockstorageVolumeBackupPolicy.cs
index 342e85079..0f6899058 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolumeBackupPolicy.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolumeBackupPolicy.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolumeBackupPolicy : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update volume backup policy fields")]
         public UpdateVolumeBackupPolicyDetails UpdateVolumeBackupPolicyDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolumeGroup.cs b/Core/Cmdlets/Update-OCIBlockstorageVolumeGroup.cs
index 6da102af1..85eceea03 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolumeGroup.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolumeGroup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolumeGroup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update volume group's set of volumes and/or display name")]
         public UpdateVolumeGroupDetails UpdateVolumeGroupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolumeGroupBackup.cs b/Core/Cmdlets/Update-OCIBlockstorageVolumeGroupBackup.cs
index 0942db7a2..20e382012 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolumeGroupBackup.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolumeGroupBackup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolumeGroupBackup : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update volume group backup fields")]
         public UpdateVolumeGroupBackupDetails UpdateVolumeGroupBackupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIBlockstorageVolumeKmsKey.cs b/Core/Cmdlets/Update-OCIBlockstorageVolumeKmsKey.cs
index 905f32c33..fb905a028 100644
--- a/Core/Cmdlets/Update-OCIBlockstorageVolumeKmsKey.cs
+++ b/Core/Cmdlets/Update-OCIBlockstorageVolumeKmsKey.cs
@@ -24,7 +24,7 @@ public class UpdateOCIBlockstorageVolumeKmsKey : OCIBlockstorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Updates the Key Management master encryption key assigned to the specified volume.")]
         public UpdateVolumeKmsKeyDetails UpdateVolumeKmsKeyDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeConsoleHistory.cs b/Core/Cmdlets/Update-OCIComputeConsoleHistory.cs
index 2374a84fa..e28b0dc21 100644
--- a/Core/Cmdlets/Update-OCIComputeConsoleHistory.cs
+++ b/Core/Cmdlets/Update-OCIComputeConsoleHistory.cs
@@ -24,7 +24,7 @@ public class UpdateOCIComputeConsoleHistory : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update instance fields")]
         public UpdateConsoleHistoryDetails UpdateConsoleHistoryDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeDedicatedVmHost.cs b/Core/Cmdlets/Update-OCIComputeDedicatedVmHost.cs
index 68d0acf82..224a0f3cf 100644
--- a/Core/Cmdlets/Update-OCIComputeDedicatedVmHost.cs
+++ b/Core/Cmdlets/Update-OCIComputeDedicatedVmHost.cs
@@ -24,7 +24,7 @@ public class UpdateOCIComputeDedicatedVmHost : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update dedicated VM host details")]
         public UpdateDedicatedVmHostDetails UpdateDedicatedVmHostDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Update-OCIComputeImage.cs b/Core/Cmdlets/Update-OCIComputeImage.cs
index 87e8da9ff..2994e6172 100644
--- a/Core/Cmdlets/Update-OCIComputeImage.cs
+++ b/Core/Cmdlets/Update-OCIComputeImage.cs
@@ -27,7 +27,7 @@ public class UpdateOCIComputeImage : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeImageCapabilitySchema.cs b/Core/Cmdlets/Update-OCIComputeImageCapabilitySchema.cs
index b884d8a21..c19f53997 100644
--- a/Core/Cmdlets/Update-OCIComputeImageCapabilitySchema.cs
+++ b/Core/Cmdlets/Update-OCIComputeImageCapabilitySchema.cs
@@ -24,7 +24,7 @@ public class UpdateOCIComputeImageCapabilitySchema : OCIComputeCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Updates the freeFormTags, definedTags, and display name of the image capability schema")]
         public UpdateComputeImageCapabilitySchemaDetails UpdateComputeImageCapabilitySchemaDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeInstance.cs b/Core/Cmdlets/Update-OCIComputeInstance.cs
index ef0729474..7ee7349d6 100644
--- a/Core/Cmdlets/Update-OCIComputeInstance.cs
+++ b/Core/Cmdlets/Update-OCIComputeInstance.cs
@@ -35,8 +35,8 @@ public class UpdateOCIComputeInstance : OCIComputeCmdlet
         public string OpcRetryToken { get; set; }
 
         
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
diff --git a/Core/Cmdlets/Update-OCIComputeInstanceConsoleConnection.cs b/Core/Cmdlets/Update-OCIComputeInstanceConsoleConnection.cs
index 248568b1f..4a9a74660 100644
--- a/Core/Cmdlets/Update-OCIComputeInstanceConsoleConnection.cs
+++ b/Core/Cmdlets/Update-OCIComputeInstanceConsoleConnection.cs
@@ -27,7 +27,7 @@ public class UpdateOCIComputeInstanceConsoleConnection : OCIComputeCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeManagementClusterNetwork.cs b/Core/Cmdlets/Update-OCIComputeManagementClusterNetwork.cs
index c18978f7b..20e611cc4 100644
--- a/Core/Cmdlets/Update-OCIComputeManagementClusterNetwork.cs
+++ b/Core/Cmdlets/Update-OCIComputeManagementClusterNetwork.cs
@@ -27,7 +27,7 @@ public class UpdateOCIComputeManagementClusterNetwork : OCIComputeManagementCmdl
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeManagementInstanceConfiguration.cs b/Core/Cmdlets/Update-OCIComputeManagementInstanceConfiguration.cs
index 013da82cf..7cd8777be 100644
--- a/Core/Cmdlets/Update-OCIComputeManagementInstanceConfiguration.cs
+++ b/Core/Cmdlets/Update-OCIComputeManagementInstanceConfiguration.cs
@@ -27,7 +27,7 @@ public class UpdateOCIComputeManagementInstanceConfiguration : OCIComputeManagem
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIComputeManagementInstancePool.cs b/Core/Cmdlets/Update-OCIComputeManagementInstancePool.cs
index e5d4b1879..d97d87d29 100644
--- a/Core/Cmdlets/Update-OCIComputeManagementInstancePool.cs
+++ b/Core/Cmdlets/Update-OCIComputeManagementInstancePool.cs
@@ -27,7 +27,7 @@ public class UpdateOCIComputeManagementInstancePool : OCIComputeManagementCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
         public string OpcRetryToken { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkByoipRange.cs b/Core/Cmdlets/Update-OCIVirtualNetworkByoipRange.cs
index 95cf9f8ef..5b1e1d6c1 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkByoipRange.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkByoipRange.cs
@@ -27,7 +27,7 @@ public class UpdateOCIVirtualNetworkByoipRange : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkCpe.cs b/Core/Cmdlets/Update-OCIVirtualNetworkCpe.cs
index 1adab1099..96df1bacb 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkCpe.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkCpe.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkCpe : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a CPE.")]
         public UpdateCpeDetails UpdateCpeDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnect.cs b/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnect.cs
index b74cd0229..69689006d 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnect.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnect.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkCrossConnect : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update CrossConnect fields.")]
         public UpdateCrossConnectDetails UpdateCrossConnectDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnectGroup.cs b/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnectGroup.cs
index 33f8c5935..85c0c3e72 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnectGroup.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkCrossConnectGroup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkCrossConnectGroup : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update CrossConnectGroup fields")]
         public UpdateCrossConnectGroupDetails UpdateCrossConnectGroupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkDhcpOptions.cs b/Core/Cmdlets/Update-OCIVirtualNetworkDhcpOptions.cs
index e5f3ed98b..0f8fd247b 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkDhcpOptions.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkDhcpOptions.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkDhcpOptions : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request object for updating a set of DHCP options.")]
         public UpdateDhcpDetails UpdateDhcpDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkDrg.cs b/Core/Cmdlets/Update-OCIVirtualNetworkDrg.cs
index c691b2ecb..5ee1d4457 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkDrg.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkDrg.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkDrg : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a DRG.")]
         public UpdateDrgDetails UpdateDrgDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkDrgAttachment.cs b/Core/Cmdlets/Update-OCIVirtualNetworkDrgAttachment.cs
index c1ffe9f17..b183db01f 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkDrgAttachment.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkDrgAttachment.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkDrgAttachment : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a `DrgAttachment`.")]
         public UpdateDrgAttachmentDetails UpdateDrgAttachmentDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnection.cs b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnection.cs
index 60d2b9cf5..5397b369d 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnection.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnection.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkIPSecConnection : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a IPSec connection.")]
         public UpdateIPSecConnectionDetails UpdateIPSecConnectionDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnel.cs b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnel.cs
index fff3c8623..6ad8dd9fa 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnel.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnel.cs
@@ -27,7 +27,7 @@ public class UpdateOCIVirtualNetworkIPSecConnectionTunnel : OCIVirtualNetworkCmd
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a IPSecConnection tunnel's details.")]
         public UpdateIPSecConnectionTunnelDetails UpdateIPSecConnectionTunnelDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnelSharedSecret.cs b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnelSharedSecret.cs
index b1bbda58f..ceed82ec9 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnelSharedSecret.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkIPSecConnectionTunnelSharedSecret.cs
@@ -27,7 +27,7 @@ public class UpdateOCIVirtualNetworkIPSecConnectionTunnelSharedSecret : OCIVirtu
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a IPSec connection tunnel's sharedSecret.")]
         public UpdateIPSecConnectionTunnelSharedSecretDetails UpdateIPSecConnectionTunnelSharedSecretDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkInternetGateway.cs b/Core/Cmdlets/Update-OCIVirtualNetworkInternetGateway.cs
index 4e06974b4..e12e49c11 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkInternetGateway.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkInternetGateway.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkInternetGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details for updating the internet gateway.")]
         public UpdateInternetGatewayDetails UpdateInternetGatewayDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkIpv6.cs b/Core/Cmdlets/Update-OCIVirtualNetworkIpv6.cs
index 72eaa7545..508fbe7a7 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkIpv6.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkIpv6.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkIpv6 : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"IPv6 details to be updated.")]
         public UpdateIpv6Details UpdateIpv6Details { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkLocalPeeringGateway.cs b/Core/Cmdlets/Update-OCIVirtualNetworkLocalPeeringGateway.cs
index 6c73da937..3a94bf3a0 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkLocalPeeringGateway.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkLocalPeeringGateway.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkLocalPeeringGateway : OCIVirtualNetworkCmdle
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a local peering gateway.")]
         public UpdateLocalPeeringGatewayDetails UpdateLocalPeeringGatewayDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkNatGateway.cs b/Core/Cmdlets/Update-OCIVirtualNetworkNatGateway.cs
index 6fe5e0ef2..cce18d1f6 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkNatGateway.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkNatGateway.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkNatGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a NAT gateway.")]
         public UpdateNatGatewayDetails UpdateNatGatewayDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkNetworkSecurityGroup.cs b/Core/Cmdlets/Update-OCIVirtualNetworkNetworkSecurityGroup.cs
index e53328494..1abdd95d8 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkNetworkSecurityGroup.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkNetworkSecurityGroup.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkNetworkSecurityGroup : OCIVirtualNetworkCmdl
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a network security group.")]
         public UpdateNetworkSecurityGroupDetails UpdateNetworkSecurityGroupDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkPrivateIp.cs b/Core/Cmdlets/Update-OCIVirtualNetworkPrivateIp.cs
index cf9dfdf64..d8050c1d2 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkPrivateIp.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkPrivateIp.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkPrivateIp : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Private IP details.")]
         public UpdatePrivateIpDetails UpdatePrivateIpDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkPublicIp.cs b/Core/Cmdlets/Update-OCIVirtualNetworkPublicIp.cs
index 7962bb2cd..9e4bdf00e 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkPublicIp.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkPublicIp.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkPublicIp : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Public IP details.")]
         public UpdatePublicIpDetails UpdatePublicIpDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkPublicIpPool.cs b/Core/Cmdlets/Update-OCIVirtualNetworkPublicIpPool.cs
index 7f63efe60..96f6b4ae2 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkPublicIpPool.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkPublicIpPool.cs
@@ -27,7 +27,7 @@ public class UpdateOCIVirtualNetworkPublicIpPool : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
         public string OpcRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkRemotePeeringConnection.cs b/Core/Cmdlets/Update-OCIVirtualNetworkRemotePeeringConnection.cs
index ed98c6b0f..157470dbb 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkRemotePeeringConnection.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkRemotePeeringConnection.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkRemotePeeringConnection : OCIVirtualNetworkC
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to the update the peering connection to remote region")]
         public UpdateRemotePeeringConnectionDetails UpdateRemotePeeringConnectionDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkRouteTable.cs b/Core/Cmdlets/Update-OCIVirtualNetworkRouteTable.cs
index 28f6a71a7..a403e66c7 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkRouteTable.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkRouteTable.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkRouteTable : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a route table.")]
         public UpdateRouteTableDetails UpdateRouteTableDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkSecurityList.cs b/Core/Cmdlets/Update-OCIVirtualNetworkSecurityList.cs
index 153391ad3..0a154eb1e 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkSecurityList.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkSecurityList.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkSecurityList : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Updated details for the security list.")]
         public UpdateSecurityListDetails UpdateSecurityListDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkServiceGateway.cs b/Core/Cmdlets/Update-OCIVirtualNetworkServiceGateway.cs
index c42242ec9..af29aa2e2 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkServiceGateway.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkServiceGateway.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkServiceGateway : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a service gateway.")]
         public UpdateServiceGatewayDetails UpdateServiceGatewayDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkSubnet.cs b/Core/Cmdlets/Update-OCIVirtualNetworkSubnet.cs
index 042899ac9..252985ba2 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkSubnet.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkSubnet.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkSubnet : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a subnet.")]
         public UpdateSubnetDetails UpdateSubnetDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkTunnelCpeDeviceConfig.cs b/Core/Cmdlets/Update-OCIVirtualNetworkTunnelCpeDeviceConfig.cs
index 9d2d50219..d67fa0a48 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkTunnelCpeDeviceConfig.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkTunnelCpeDeviceConfig.cs
@@ -27,7 +27,7 @@ public class UpdateOCIVirtualNetworkTunnelCpeDeviceConfig : OCIVirtualNetworkCmd
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to input the tunnel's cpe configuration parameters")]
         public UpdateTunnelCpeDeviceConfigDetails UpdateTunnelCpeDeviceConfigDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).")]
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkVcn.cs b/Core/Cmdlets/Update-OCIVirtualNetworkVcn.cs
index 7461104c0..0e4c8a37e 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkVcn.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkVcn.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkVcn : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a VCN.")]
         public UpdateVcnDetails UpdateVcnDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkVirtualCircuit.cs b/Core/Cmdlets/Update-OCIVirtualNetworkVirtualCircuit.cs
index c9acde65a..72ed37621 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkVirtualCircuit.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkVirtualCircuit.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkVirtualCircuit : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Update VirtualCircuit fields.")]
         public UpdateVirtualCircuitDetails UpdateVirtualCircuitDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkVlan.cs b/Core/Cmdlets/Update-OCIVirtualNetworkVlan.cs
index c6b206181..2cc8a5b76 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkVlan.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkVlan.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkVlan : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a subnet.")]
         public UpdateVlanDetails UpdateVlanDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
diff --git a/Core/Cmdlets/Update-OCIVirtualNetworkVnic.cs b/Core/Cmdlets/Update-OCIVirtualNetworkVnic.cs
index e9a8270fa..1f59ef4b5 100644
--- a/Core/Cmdlets/Update-OCIVirtualNetworkVnic.cs
+++ b/Core/Cmdlets/Update-OCIVirtualNetworkVnic.cs
@@ -24,7 +24,7 @@ public class UpdateOCIVirtualNetworkVnic : OCIVirtualNetworkCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Details object for updating a VNIC.")]
         public UpdateVnicDetails UpdateVnicDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
         public string IfMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Core/OCI.PSModules.Core.psd1 b/Core/OCI.PSModules.Core.psd1
index 3a1a9fdda..324ee778b 100644
--- a/Core/OCI.PSModules.Core.psd1
+++ b/Core/OCI.PSModules.Core.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Core.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Core.dll'
diff --git a/Database/Cmdlets/Disable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs b/Database/Cmdlets/Disable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..187c64660
--- /dev/null
+++ b/Database/Cmdlets/Disable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Disable", "OCIDatabaseExternalContainerDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DisableExternalContainerDatabaseDatabaseManagementResponse) })]
+    public class DisableOCIDatabaseExternalContainerDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            DisableExternalContainerDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new DisableExternalContainerDatabaseDatabaseManagementRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DisableExternalContainerDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDisableExternalContainerDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DisableExternalContainerDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DisableExternalContainerDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Disable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs b/Database/Cmdlets/Disable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..be447db66
--- /dev/null
+++ b/Database/Cmdlets/Disable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Disable", "OCIDatabaseExternalNonContainerDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DisableExternalNonContainerDatabaseDatabaseManagementResponse) })]
+    public class DisableOCIDatabaseExternalNonContainerDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            DisableExternalNonContainerDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new DisableExternalNonContainerDatabaseDatabaseManagementRequest
+                {
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DisableExternalNonContainerDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDisableExternalNonContainerDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DisableExternalNonContainerDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DisableExternalNonContainerDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Disable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs b/Database/Cmdlets/Disable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..6d67e10dc
--- /dev/null
+++ b/Database/Cmdlets/Disable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Disable", "OCIDatabaseExternalPluggableDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DisableExternalPluggableDatabaseDatabaseManagementResponse) })]
+    public class DisableOCIDatabaseExternalPluggableDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            DisableExternalPluggableDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new DisableExternalPluggableDatabaseDatabaseManagementRequest
+                {
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DisableExternalPluggableDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDisableExternalPluggableDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DisableExternalPluggableDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DisableExternalPluggableDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Enable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs b/Database/Cmdlets/Enable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..d76eeb5a5
--- /dev/null
+++ b/Database/Cmdlets/Enable-OCIDatabaseExternalContainerDatabaseDatabaseManagement.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Enable", "OCIDatabaseExternalContainerDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.EnableExternalContainerDatabaseDatabaseManagementResponse) })]
+    public class EnableOCIDatabaseExternalContainerDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external container database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external container database.", ParameterSetName = Default)]
+        public EnableExternalContainerDatabaseDatabaseManagementDetails EnableExternalContainerDatabaseDatabaseManagementDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            EnableExternalContainerDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new EnableExternalContainerDatabaseDatabaseManagementRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    EnableExternalContainerDatabaseDatabaseManagementDetails = EnableExternalContainerDatabaseDatabaseManagementDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(EnableExternalContainerDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForEnableExternalContainerDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.EnableExternalContainerDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private EnableExternalContainerDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Enable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs b/Database/Cmdlets/Enable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..6b877322b
--- /dev/null
+++ b/Database/Cmdlets/Enable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Enable", "OCIDatabaseExternalNonContainerDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.EnableExternalNonContainerDatabaseDatabaseManagementResponse) })]
+    public class EnableOCIDatabaseExternalNonContainerDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external non-container database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external non-container database.", ParameterSetName = Default)]
+        public EnableExternalNonContainerDatabaseDatabaseManagementDetails EnableExternalNonContainerDatabaseDatabaseManagementDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            EnableExternalNonContainerDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new EnableExternalNonContainerDatabaseDatabaseManagementRequest
+                {
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    EnableExternalNonContainerDatabaseDatabaseManagementDetails = EnableExternalNonContainerDatabaseDatabaseManagementDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(EnableExternalNonContainerDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForEnableExternalNonContainerDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.EnableExternalNonContainerDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private EnableExternalNonContainerDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Enable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs b/Database/Cmdlets/Enable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs
new file mode 100644
index 000000000..79123f4ee
--- /dev/null
+++ b/Database/Cmdlets/Enable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Enable", "OCIDatabaseExternalPluggableDatabaseDatabaseManagement", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.EnableExternalPluggableDatabaseDatabaseManagementResponse) })]
+    public class EnableOCIDatabaseExternalPluggableDatabaseDatabaseManagement : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to enable the Database Management Service for an external database.", ParameterSetName = Default)]
+        public EnableExternalPluggableDatabaseDatabaseManagementDetails EnableExternalPluggableDatabaseDatabaseManagementDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            EnableExternalPluggableDatabaseDatabaseManagementRequest request;
+
+            try
+            {
+                request = new EnableExternalPluggableDatabaseDatabaseManagementRequest
+                {
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    EnableExternalPluggableDatabaseDatabaseManagementDetails = EnableExternalPluggableDatabaseDatabaseManagementDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(EnableExternalPluggableDatabaseDatabaseManagementRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForEnableExternalPluggableDatabaseDatabaseManagement(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.EnableExternalPluggableDatabaseDatabaseManagement(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private EnableExternalPluggableDatabaseDatabaseManagementResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabase.cs b/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabase.cs
new file mode 100644
index 000000000..10625b0d2
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabase.cs
@@ -0,0 +1,94 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalContainerDatabase), typeof(Oci.DatabaseService.Responses.GetExternalContainerDatabaseResponse) })]
+    public class GetOCIDatabaseExternalContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = LifecycleStateParamSet)]
+        public Oci.DatabaseService.Models.ExternalContainerDatabase.LifecycleStateEnum[] WaitForLifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetExternalContainerDatabaseRequest request;
+
+            try
+            {
+                request = new GetExternalContainerDatabaseRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(GetExternalContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case LifecycleStateParamSet:
+                    response = client.Waiters.ForExternalContainerDatabase(request, waiterConfig, WaitForLifecycleState).Execute();
+                    break;
+
+                case Default:
+                    response = client.GetExternalContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalContainerDatabase);
+        }
+
+        private GetExternalContainerDatabaseResponse response;
+        private const string LifecycleStateParamSet = "LifecycleStateParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabasesList.cs b/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabasesList.cs
new file mode 100644
index 000000000..4ccbcc07b
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalContainerDatabasesList.cs
@@ -0,0 +1,107 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalContainerDatabasesList")]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalContainerDatabaseSummary), typeof(Oci.DatabaseService.Responses.ListExternalContainerDatabasesResponse) })]
+    public class GetOCIDatabaseExternalContainerDatabasesList : OCIDatabaseCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The compartment [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
+        public string CompartmentId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return per page.", ParameterSetName = LimitSet)]
+        public System.Nullable<int> Limit { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The pagination token to continue listing from.")]
+        public string Page { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The field to sort by. You can provide one sort order (`sortOrder`). Default order for TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME sort order is case sensitive.")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalContainerDatabasesRequest.SortByEnum> SortBy { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`).")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalContainerDatabasesRequest.SortOrderEnum> SortOrder { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the specified lifecycle state.")]
+        public System.Nullable<Oci.DatabaseService.Models.ExternalDatabaseBase.LifecycleStateEnum> LifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the entire display name given. The match is not case sensitive.")]
+        public string DisplayName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
+        public SwitchParameter All { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListExternalContainerDatabasesRequest request;
+
+            try
+            {
+                request = new ListExternalContainerDatabasesRequest
+                {
+                    CompartmentId = CompartmentId,
+                    OpcRequestId = OpcRequestId,
+                    Limit = Limit,
+                    Page = Page,
+                    SortBy = SortBy,
+                    SortOrder = SortOrder,
+                    LifecycleState = LifecycleState,
+                    DisplayName = DisplayName
+                };
+                IEnumerable<ListExternalContainerDatabasesResponse> responses = GetRequestDelegate().Invoke(request);
+                foreach (var item in responses)
+                {
+                    response = item;
+                    WriteOutput(response, response.Items, true);
+                }
+                if(!ParameterSetName.Equals(AllPageSet) && response.OpcNextPage != null)
+                {
+                    WriteWarning("This operation supports pagination and not all resources were returned.  Re-run using the -all option to auto paginate and list all resources.");
+                }
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private RequestDelegate GetRequestDelegate()
+        {
+            IEnumerable<ListExternalContainerDatabasesResponse> DefaultRequest(ListExternalContainerDatabasesRequest request) => Enumerable.Repeat(client.ListExternalContainerDatabases(request).GetAwaiter().GetResult(), 1);
+            if (ParameterSetName.Equals(AllPageSet))
+            {
+                return req => client.Paginators.ListExternalContainerDatabasesResponseEnumerator(req);
+            }
+            return DefaultRequest;
+        }
+
+        private ListExternalContainerDatabasesResponse response;
+        private delegate IEnumerable<ListExternalContainerDatabasesResponse> RequestDelegate(ListExternalContainerDatabasesRequest request);
+        private const string AllPageSet = "AllPages";
+        private const string LimitSet = "Limit";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnector.cs b/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnector.cs
new file mode 100644
index 000000000..bcf604ad5
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnector.cs
@@ -0,0 +1,94 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalDatabaseConnector", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalDatabaseConnector), typeof(Oci.DatabaseService.Responses.GetExternalDatabaseConnectorResponse) })]
+    public class GetOCIDatabaseExternalDatabaseConnector : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = Default)]
+        public string ExternalDatabaseConnectorId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = LifecycleStateParamSet)]
+        public Oci.DatabaseService.Models.ExternalDatabaseConnector.LifecycleStateEnum[] WaitForLifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetExternalDatabaseConnectorRequest request;
+
+            try
+            {
+                request = new GetExternalDatabaseConnectorRequest
+                {
+                    ExternalDatabaseConnectorId = ExternalDatabaseConnectorId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(GetExternalDatabaseConnectorRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case LifecycleStateParamSet:
+                    response = client.Waiters.ForExternalDatabaseConnector(request, waiterConfig, WaitForLifecycleState).Execute();
+                    break;
+
+                case Default:
+                    response = client.GetExternalDatabaseConnector(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalDatabaseConnector);
+        }
+
+        private GetExternalDatabaseConnectorResponse response;
+        private const string LifecycleStateParamSet = "LifecycleStateParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnectorsList.cs b/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnectorsList.cs
new file mode 100644
index 000000000..bb32b0121
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalDatabaseConnectorsList.cs
@@ -0,0 +1,111 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalDatabaseConnectorsList")]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalDatabaseConnectorSummary), typeof(Oci.DatabaseService.Responses.ListExternalDatabaseConnectorsResponse) })]
+    public class GetOCIDatabaseExternalDatabaseConnectorsList : OCIDatabaseCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The compartment [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
+        public string CompartmentId { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database whose connectors will be listed.")]
+        public string ExternalDatabaseId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return per page.", ParameterSetName = LimitSet)]
+        public System.Nullable<int> Limit { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The pagination token to continue listing from.")]
+        public string Page { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The field to sort by. You can provide one sort order (`sortOrder`). Default order for TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME sort order is case sensitive.")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalDatabaseConnectorsRequest.SortByEnum> SortBy { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`).")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalDatabaseConnectorsRequest.SortOrderEnum> SortOrder { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the specified lifecycle state.")]
+        public System.Nullable<Oci.DatabaseService.Models.ExternalDatabaseConnector.LifecycleStateEnum> LifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the entire display name given. The match is not case sensitive.")]
+        public string DisplayName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
+        public SwitchParameter All { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListExternalDatabaseConnectorsRequest request;
+
+            try
+            {
+                request = new ListExternalDatabaseConnectorsRequest
+                {
+                    CompartmentId = CompartmentId,
+                    ExternalDatabaseId = ExternalDatabaseId,
+                    OpcRequestId = OpcRequestId,
+                    Limit = Limit,
+                    Page = Page,
+                    SortBy = SortBy,
+                    SortOrder = SortOrder,
+                    LifecycleState = LifecycleState,
+                    DisplayName = DisplayName
+                };
+                IEnumerable<ListExternalDatabaseConnectorsResponse> responses = GetRequestDelegate().Invoke(request);
+                foreach (var item in responses)
+                {
+                    response = item;
+                    WriteOutput(response, response.Items, true);
+                }
+                if(!ParameterSetName.Equals(AllPageSet) && response.OpcNextPage != null)
+                {
+                    WriteWarning("This operation supports pagination and not all resources were returned.  Re-run using the -all option to auto paginate and list all resources.");
+                }
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private RequestDelegate GetRequestDelegate()
+        {
+            IEnumerable<ListExternalDatabaseConnectorsResponse> DefaultRequest(ListExternalDatabaseConnectorsRequest request) => Enumerable.Repeat(client.ListExternalDatabaseConnectors(request).GetAwaiter().GetResult(), 1);
+            if (ParameterSetName.Equals(AllPageSet))
+            {
+                return req => client.Paginators.ListExternalDatabaseConnectorsResponseEnumerator(req);
+            }
+            return DefaultRequest;
+        }
+
+        private ListExternalDatabaseConnectorsResponse response;
+        private delegate IEnumerable<ListExternalDatabaseConnectorsResponse> RequestDelegate(ListExternalDatabaseConnectorsRequest request);
+        private const string AllPageSet = "AllPages";
+        private const string LimitSet = "Limit";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabase.cs b/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabase.cs
new file mode 100644
index 000000000..9e2490f80
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabase.cs
@@ -0,0 +1,94 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalNonContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalNonContainerDatabase), typeof(Oci.DatabaseService.Responses.GetExternalNonContainerDatabaseResponse) })]
+    public class GetOCIDatabaseExternalNonContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = LifecycleStateParamSet)]
+        public Oci.DatabaseService.Models.ExternalNonContainerDatabase.LifecycleStateEnum[] WaitForLifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetExternalNonContainerDatabaseRequest request;
+
+            try
+            {
+                request = new GetExternalNonContainerDatabaseRequest
+                {
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(GetExternalNonContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case LifecycleStateParamSet:
+                    response = client.Waiters.ForExternalNonContainerDatabase(request, waiterConfig, WaitForLifecycleState).Execute();
+                    break;
+
+                case Default:
+                    response = client.GetExternalNonContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalNonContainerDatabase);
+        }
+
+        private GetExternalNonContainerDatabaseResponse response;
+        private const string LifecycleStateParamSet = "LifecycleStateParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabasesList.cs b/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabasesList.cs
new file mode 100644
index 000000000..eef79fc3a
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalNonContainerDatabasesList.cs
@@ -0,0 +1,107 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalNonContainerDatabasesList")]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalNonContainerDatabaseSummary), typeof(Oci.DatabaseService.Responses.ListExternalNonContainerDatabasesResponse) })]
+    public class GetOCIDatabaseExternalNonContainerDatabasesList : OCIDatabaseCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The compartment [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
+        public string CompartmentId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return per page.", ParameterSetName = LimitSet)]
+        public System.Nullable<int> Limit { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The pagination token to continue listing from.")]
+        public string Page { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The field to sort by. You can provide one sort order (`sortOrder`). Default order for TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME sort order is case sensitive.")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalNonContainerDatabasesRequest.SortByEnum> SortBy { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`).")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalNonContainerDatabasesRequest.SortOrderEnum> SortOrder { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the specified lifecycle state.")]
+        public System.Nullable<Oci.DatabaseService.Models.ExternalDatabaseBase.LifecycleStateEnum> LifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the entire display name given. The match is not case sensitive.")]
+        public string DisplayName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
+        public SwitchParameter All { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListExternalNonContainerDatabasesRequest request;
+
+            try
+            {
+                request = new ListExternalNonContainerDatabasesRequest
+                {
+                    CompartmentId = CompartmentId,
+                    OpcRequestId = OpcRequestId,
+                    Limit = Limit,
+                    Page = Page,
+                    SortBy = SortBy,
+                    SortOrder = SortOrder,
+                    LifecycleState = LifecycleState,
+                    DisplayName = DisplayName
+                };
+                IEnumerable<ListExternalNonContainerDatabasesResponse> responses = GetRequestDelegate().Invoke(request);
+                foreach (var item in responses)
+                {
+                    response = item;
+                    WriteOutput(response, response.Items, true);
+                }
+                if(!ParameterSetName.Equals(AllPageSet) && response.OpcNextPage != null)
+                {
+                    WriteWarning("This operation supports pagination and not all resources were returned.  Re-run using the -all option to auto paginate and list all resources.");
+                }
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private RequestDelegate GetRequestDelegate()
+        {
+            IEnumerable<ListExternalNonContainerDatabasesResponse> DefaultRequest(ListExternalNonContainerDatabasesRequest request) => Enumerable.Repeat(client.ListExternalNonContainerDatabases(request).GetAwaiter().GetResult(), 1);
+            if (ParameterSetName.Equals(AllPageSet))
+            {
+                return req => client.Paginators.ListExternalNonContainerDatabasesResponseEnumerator(req);
+            }
+            return DefaultRequest;
+        }
+
+        private ListExternalNonContainerDatabasesResponse response;
+        private delegate IEnumerable<ListExternalNonContainerDatabasesResponse> RequestDelegate(ListExternalNonContainerDatabasesRequest request);
+        private const string AllPageSet = "AllPages";
+        private const string LimitSet = "Limit";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabase.cs b/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabase.cs
new file mode 100644
index 000000000..cfa3e67ee
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabase.cs
@@ -0,0 +1,94 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalPluggableDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalPluggableDatabase), typeof(Oci.DatabaseService.Responses.GetExternalPluggableDatabaseResponse) })]
+    public class GetOCIDatabaseExternalPluggableDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = LifecycleStateParamSet)]
+        public Oci.DatabaseService.Models.ExternalPluggableDatabase.LifecycleStateEnum[] WaitForLifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetExternalPluggableDatabaseRequest request;
+
+            try
+            {
+                request = new GetExternalPluggableDatabaseRequest
+                {
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(GetExternalPluggableDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case LifecycleStateParamSet:
+                    response = client.Waiters.ForExternalPluggableDatabase(request, waiterConfig, WaitForLifecycleState).Execute();
+                    break;
+
+                case Default:
+                    response = client.GetExternalPluggableDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalPluggableDatabase);
+        }
+
+        private GetExternalPluggableDatabaseResponse response;
+        private const string LifecycleStateParamSet = "LifecycleStateParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabasesList.cs b/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabasesList.cs
new file mode 100644
index 000000000..dfb468aea
--- /dev/null
+++ b/Database/Cmdlets/Get-OCIDatabaseExternalPluggableDatabasesList.cs
@@ -0,0 +1,111 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Get", "OCIDatabaseExternalPluggableDatabasesList")]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalPluggableDatabaseSummary), typeof(Oci.DatabaseService.Responses.ListExternalPluggableDatabasesResponse) })]
+    public class GetOCIDatabaseExternalPluggableDatabasesList : OCIDatabaseCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The compartment [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
+        public string CompartmentId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).")]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return per page.", ParameterSetName = LimitSet)]
+        public System.Nullable<int> Limit { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The pagination token to continue listing from.")]
+        public string Page { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The field to sort by. You can provide one sort order (`sortOrder`). Default order for TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME sort order is case sensitive.")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalPluggableDatabasesRequest.SortByEnum> SortBy { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use, either ascending (`ASC`) or descending (`DESC`).")]
+        public System.Nullable<Oci.DatabaseService.Requests.ListExternalPluggableDatabasesRequest.SortOrderEnum> SortOrder { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the specified lifecycle state.")]
+        public System.Nullable<Oci.DatabaseService.Models.ExternalDatabaseBase.LifecycleStateEnum> LifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the entire display name given. The match is not case sensitive.")]
+        public string DisplayName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
+        public SwitchParameter All { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListExternalPluggableDatabasesRequest request;
+
+            try
+            {
+                request = new ListExternalPluggableDatabasesRequest
+                {
+                    CompartmentId = CompartmentId,
+                    OpcRequestId = OpcRequestId,
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    Limit = Limit,
+                    Page = Page,
+                    SortBy = SortBy,
+                    SortOrder = SortOrder,
+                    LifecycleState = LifecycleState,
+                    DisplayName = DisplayName
+                };
+                IEnumerable<ListExternalPluggableDatabasesResponse> responses = GetRequestDelegate().Invoke(request);
+                foreach (var item in responses)
+                {
+                    response = item;
+                    WriteOutput(response, response.Items, true);
+                }
+                if(!ParameterSetName.Equals(AllPageSet) && response.OpcNextPage != null)
+                {
+                    WriteWarning("This operation supports pagination and not all resources were returned.  Re-run using the -all option to auto paginate and list all resources.");
+                }
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private RequestDelegate GetRequestDelegate()
+        {
+            IEnumerable<ListExternalPluggableDatabasesResponse> DefaultRequest(ListExternalPluggableDatabasesRequest request) => Enumerable.Repeat(client.ListExternalPluggableDatabases(request).GetAwaiter().GetResult(), 1);
+            if (ParameterSetName.Equals(AllPageSet))
+            {
+                return req => client.Paginators.ListExternalPluggableDatabasesResponseEnumerator(req);
+            }
+            return DefaultRequest;
+        }
+
+        private ListExternalPluggableDatabasesResponse response;
+        private delegate IEnumerable<ListExternalPluggableDatabasesResponse> RequestDelegate(ListExternalPluggableDatabasesRequest request);
+        private const string AllPageSet = "AllPages";
+        private const string LimitSet = "Limit";
+    }
+}
diff --git a/Database/Cmdlets/Invoke-OCIDatabaseCheckExternalDatabaseConnectorConnectionStatus.cs b/Database/Cmdlets/Invoke-OCIDatabaseCheckExternalDatabaseConnectorConnectionStatus.cs
new file mode 100644
index 000000000..dd18fc7b2
--- /dev/null
+++ b/Database/Cmdlets/Invoke-OCIDatabaseCheckExternalDatabaseConnectorConnectionStatus.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Invoke", "OCIDatabaseCheckExternalDatabaseConnectorConnectionStatus", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.CheckExternalDatabaseConnectorConnectionStatusResponse) })]
+    public class InvokeOCIDatabaseCheckExternalDatabaseConnectorConnectionStatus : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = Default)]
+        public string ExternalDatabaseConnectorId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CheckExternalDatabaseConnectorConnectionStatusRequest request;
+
+            try
+            {
+                request = new CheckExternalDatabaseConnectorConnectionStatusRequest
+                {
+                    ExternalDatabaseConnectorId = ExternalDatabaseConnectorId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(CheckExternalDatabaseConnectorConnectionStatusRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForCheckExternalDatabaseConnectorConnectionStatus(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.CheckExternalDatabaseConnectorConnectionStatus(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private CheckExternalDatabaseConnectorConnectionStatusResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Invoke-OCIDatabaseScanExternalContainerDatabasePluggableDatabases.cs b/Database/Cmdlets/Invoke-OCIDatabaseScanExternalContainerDatabasePluggableDatabases.cs
new file mode 100644
index 000000000..3f5b1a695
--- /dev/null
+++ b/Database/Cmdlets/Invoke-OCIDatabaseScanExternalContainerDatabasePluggableDatabases.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Invoke", "OCIDatabaseScanExternalContainerDatabasePluggableDatabases", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.ScanExternalContainerDatabasePluggableDatabasesResponse) })]
+    public class InvokeOCIDatabaseScanExternalContainerDatabasePluggableDatabases : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = Default)]
+        public string ExternalDatabaseConnectorId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ScanExternalContainerDatabasePluggableDatabasesRequest request;
+
+            try
+            {
+                request = new ScanExternalContainerDatabasePluggableDatabasesRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    ExternalDatabaseConnectorId = ExternalDatabaseConnectorId,
+                    OpcRequestId = OpcRequestId,
+                    OpcRetryToken = OpcRetryToken
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(ScanExternalContainerDatabasePluggableDatabasesRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForScanExternalContainerDatabasePluggableDatabases(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.ScanExternalContainerDatabasePluggableDatabases(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private ScanExternalContainerDatabasePluggableDatabasesResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Move-OCIDatabaseExternalContainerDatabaseCompartment.cs b/Database/Cmdlets/Move-OCIDatabaseExternalContainerDatabaseCompartment.cs
new file mode 100644
index 000000000..1f2f57632
--- /dev/null
+++ b/Database/Cmdlets/Move-OCIDatabaseExternalContainerDatabaseCompartment.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Move", "OCIDatabaseExternalContainerDatabaseCompartment", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.ChangeExternalContainerDatabaseCompartmentResponse) })]
+    public class MoveOCIDatabaseExternalContainerDatabaseCompartment : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the external container database to a different compartment.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the external container database to a different compartment.", ParameterSetName = Default)]
+        public ChangeCompartmentDetails ChangeCompartmentDetails { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ChangeExternalContainerDatabaseCompartmentRequest request;
+
+            try
+            {
+                request = new ChangeExternalContainerDatabaseCompartmentRequest
+                {
+                    ChangeCompartmentDetails = ChangeCompartmentDetails,
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(ChangeExternalContainerDatabaseCompartmentRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForChangeExternalContainerDatabaseCompartment(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.ChangeExternalContainerDatabaseCompartment(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private ChangeExternalContainerDatabaseCompartmentResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Move-OCIDatabaseExternalNonContainerDatabaseCompartment.cs b/Database/Cmdlets/Move-OCIDatabaseExternalNonContainerDatabaseCompartment.cs
new file mode 100644
index 000000000..2ffcac7b1
--- /dev/null
+++ b/Database/Cmdlets/Move-OCIDatabaseExternalNonContainerDatabaseCompartment.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Move", "OCIDatabaseExternalNonContainerDatabaseCompartment", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.ChangeExternalNonContainerDatabaseCompartmentResponse) })]
+    public class MoveOCIDatabaseExternalNonContainerDatabaseCompartment : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the external non-container database to a different compartment.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the external non-container database to a different compartment.", ParameterSetName = Default)]
+        public ChangeCompartmentDetails ChangeCompartmentDetails { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ChangeExternalNonContainerDatabaseCompartmentRequest request;
+
+            try
+            {
+                request = new ChangeExternalNonContainerDatabaseCompartmentRequest
+                {
+                    ChangeCompartmentDetails = ChangeCompartmentDetails,
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(ChangeExternalNonContainerDatabaseCompartmentRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForChangeExternalNonContainerDatabaseCompartment(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.ChangeExternalNonContainerDatabaseCompartment(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private ChangeExternalNonContainerDatabaseCompartmentResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Move-OCIDatabaseExternalPluggableDatabaseCompartment.cs b/Database/Cmdlets/Move-OCIDatabaseExternalPluggableDatabaseCompartment.cs
new file mode 100644
index 000000000..a65cb2901
--- /dev/null
+++ b/Database/Cmdlets/Move-OCIDatabaseExternalPluggableDatabaseCompartment.cs
@@ -0,0 +1,112 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Move", "OCIDatabaseExternalPluggableDatabaseCompartment", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.ChangeExternalPluggableDatabaseCompartmentResponse) })]
+    public class MoveOCIDatabaseExternalPluggableDatabaseCompartment : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the CreateExternalPluggableDatabaseDetails resource to a different compartment.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to move the CreateExternalPluggableDatabaseDetails resource to a different compartment.", ParameterSetName = Default)]
+        public ChangeCompartmentDetails ChangeCompartmentDetails { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ChangeExternalPluggableDatabaseCompartmentRequest request;
+
+            try
+            {
+                request = new ChangeExternalPluggableDatabaseCompartmentRequest
+                {
+                    ChangeCompartmentDetails = ChangeCompartmentDetails,
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(ChangeExternalPluggableDatabaseCompartmentRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForChangeExternalPluggableDatabaseCompartment(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.ChangeExternalPluggableDatabaseCompartment(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private ChangeExternalPluggableDatabaseCompartmentResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/New-OCIDatabaseExternalContainerDatabase.cs b/Database/Cmdlets/New-OCIDatabaseExternalContainerDatabase.cs
new file mode 100644
index 000000000..146c31fb4
--- /dev/null
+++ b/Database/Cmdlets/New-OCIDatabaseExternalContainerDatabase.cs
@@ -0,0 +1,100 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("New", "OCIDatabaseExternalContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalContainerDatabase), typeof(Oci.DatabaseService.Responses.CreateExternalContainerDatabaseResponse) })]
+    public class NewOCIDatabaseExternalContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external container database resource.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external container database resource.", ParameterSetName = Default)]
+        public CreateExternalContainerDatabaseDetails CreateExternalContainerDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CreateExternalContainerDatabaseRequest request;
+
+            try
+            {
+                request = new CreateExternalContainerDatabaseRequest
+                {
+                    CreateExternalContainerDatabaseDetails = CreateExternalContainerDatabaseDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(CreateExternalContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForCreateExternalContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.CreateExternalContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalContainerDatabase);
+        }
+
+        private CreateExternalContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/New-OCIDatabaseExternalDatabaseConnector.cs b/Database/Cmdlets/New-OCIDatabaseExternalDatabaseConnector.cs
new file mode 100644
index 000000000..68fe61f9e
--- /dev/null
+++ b/Database/Cmdlets/New-OCIDatabaseExternalDatabaseConnector.cs
@@ -0,0 +1,100 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("New", "OCIDatabaseExternalDatabaseConnector", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalDatabaseConnector), typeof(Oci.DatabaseService.Responses.CreateExternalDatabaseConnectorResponse) })]
+    public class NewOCIDatabaseExternalDatabaseConnector : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a connector to an external database. This parameter also accepts subtype <Oci.DatabaseService.Models.CreateExternalMacsConnectorDetails> of type <Oci.DatabaseService.Models.CreateExternalDatabaseConnectorDetails>.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a connector to an external database. This parameter also accepts subtype <Oci.DatabaseService.Models.CreateExternalMacsConnectorDetails> of type <Oci.DatabaseService.Models.CreateExternalDatabaseConnectorDetails>.", ParameterSetName = Default)]
+        public CreateExternalDatabaseConnectorDetails CreateExternalDatabaseConnectorDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CreateExternalDatabaseConnectorRequest request;
+
+            try
+            {
+                request = new CreateExternalDatabaseConnectorRequest
+                {
+                    CreateExternalDatabaseConnectorDetails = CreateExternalDatabaseConnectorDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(CreateExternalDatabaseConnectorRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForCreateExternalDatabaseConnector(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.CreateExternalDatabaseConnector(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalDatabaseConnector);
+        }
+
+        private CreateExternalDatabaseConnectorResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/New-OCIDatabaseExternalNonContainerDatabase.cs b/Database/Cmdlets/New-OCIDatabaseExternalNonContainerDatabase.cs
new file mode 100644
index 000000000..6828e98b5
--- /dev/null
+++ b/Database/Cmdlets/New-OCIDatabaseExternalNonContainerDatabase.cs
@@ -0,0 +1,100 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("New", "OCIDatabaseExternalNonContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalNonContainerDatabase), typeof(Oci.DatabaseService.Responses.CreateExternalNonContainerDatabaseResponse) })]
+    public class NewOCIDatabaseExternalNonContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external non-container database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external non-container database.", ParameterSetName = Default)]
+        public CreateExternalNonContainerDatabaseDetails CreateExternalNonContainerDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CreateExternalNonContainerDatabaseRequest request;
+
+            try
+            {
+                request = new CreateExternalNonContainerDatabaseRequest
+                {
+                    CreateExternalNonContainerDatabaseDetails = CreateExternalNonContainerDatabaseDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(CreateExternalNonContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForCreateExternalNonContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.CreateExternalNonContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalNonContainerDatabase);
+        }
+
+        private CreateExternalNonContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/New-OCIDatabaseExternalPluggableDatabase.cs b/Database/Cmdlets/New-OCIDatabaseExternalPluggableDatabase.cs
new file mode 100644
index 000000000..e1bad6af5
--- /dev/null
+++ b/Database/Cmdlets/New-OCIDatabaseExternalPluggableDatabase.cs
@@ -0,0 +1,100 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("New", "OCIDatabaseExternalPluggableDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalPluggableDatabase), typeof(Oci.DatabaseService.Responses.CreateExternalPluggableDatabaseResponse) })]
+    public class NewOCIDatabaseExternalPluggableDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external pluggable database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to create a new external pluggable database.", ParameterSetName = Default)]
+        public CreateExternalPluggableDatabaseDetails CreateExternalPluggableDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of executing that same action again. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations (for example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected).", ParameterSetName = Default)]
+        public string OpcRetryToken { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CreateExternalPluggableDatabaseRequest request;
+
+            try
+            {
+                request = new CreateExternalPluggableDatabaseRequest
+                {
+                    CreateExternalPluggableDatabaseDetails = CreateExternalPluggableDatabaseDetails,
+                    OpcRetryToken = OpcRetryToken,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(CreateExternalPluggableDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForCreateExternalPluggableDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.CreateExternalPluggableDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalPluggableDatabase);
+        }
+
+        private CreateExternalPluggableDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Remove-OCIDatabaseExternalContainerDatabase.cs b/Database/Cmdlets/Remove-OCIDatabaseExternalContainerDatabase.cs
new file mode 100644
index 000000000..5f675bc2a
--- /dev/null
+++ b/Database/Cmdlets/Remove-OCIDatabaseExternalContainerDatabase.cs
@@ -0,0 +1,109 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Remove", "OCIDatabaseExternalContainerDatabase", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High, DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DeleteExternalContainerDatabaseResponse) })]
+    public class RemoveOCIDatabaseExternalContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
+        public SwitchParameter Force { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+
+            if (!ConfirmDelete("OCIDatabaseExternalContainerDatabase", "Remove"))
+            {
+               return;
+            }
+
+            DeleteExternalContainerDatabaseRequest request;
+
+            try
+            {
+                request = new DeleteExternalContainerDatabaseRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DeleteExternalContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDeleteExternalContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DeleteExternalContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DeleteExternalContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Remove-OCIDatabaseExternalDatabaseConnector.cs b/Database/Cmdlets/Remove-OCIDatabaseExternalDatabaseConnector.cs
new file mode 100644
index 000000000..6e92632a3
--- /dev/null
+++ b/Database/Cmdlets/Remove-OCIDatabaseExternalDatabaseConnector.cs
@@ -0,0 +1,109 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Remove", "OCIDatabaseExternalDatabaseConnector", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High, DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DeleteExternalDatabaseConnectorResponse) })]
+    public class RemoveOCIDatabaseExternalDatabaseConnector : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = Default)]
+        public string ExternalDatabaseConnectorId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
+        public SwitchParameter Force { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+
+            if (!ConfirmDelete("OCIDatabaseExternalDatabaseConnector", "Remove"))
+            {
+               return;
+            }
+
+            DeleteExternalDatabaseConnectorRequest request;
+
+            try
+            {
+                request = new DeleteExternalDatabaseConnectorRequest
+                {
+                    ExternalDatabaseConnectorId = ExternalDatabaseConnectorId,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DeleteExternalDatabaseConnectorRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDeleteExternalDatabaseConnector(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DeleteExternalDatabaseConnector(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DeleteExternalDatabaseConnectorResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Remove-OCIDatabaseExternalNonContainerDatabase.cs b/Database/Cmdlets/Remove-OCIDatabaseExternalNonContainerDatabase.cs
new file mode 100644
index 000000000..d1b95d43b
--- /dev/null
+++ b/Database/Cmdlets/Remove-OCIDatabaseExternalNonContainerDatabase.cs
@@ -0,0 +1,109 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Remove", "OCIDatabaseExternalNonContainerDatabase", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High, DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DeleteExternalNonContainerDatabaseResponse) })]
+    public class RemoveOCIDatabaseExternalNonContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
+        public SwitchParameter Force { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+
+            if (!ConfirmDelete("OCIDatabaseExternalNonContainerDatabase", "Remove"))
+            {
+               return;
+            }
+
+            DeleteExternalNonContainerDatabaseRequest request;
+
+            try
+            {
+                request = new DeleteExternalNonContainerDatabaseRequest
+                {
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DeleteExternalNonContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDeleteExternalNonContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DeleteExternalNonContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DeleteExternalNonContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Remove-OCIDatabaseExternalPluggableDatabase.cs b/Database/Cmdlets/Remove-OCIDatabaseExternalPluggableDatabase.cs
new file mode 100644
index 000000000..570ff7b99
--- /dev/null
+++ b/Database/Cmdlets/Remove-OCIDatabaseExternalPluggableDatabase.cs
@@ -0,0 +1,109 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Remove", "OCIDatabaseExternalPluggableDatabase", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High, DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.PSModules.Common.Cmdlets.WorkRequest), typeof(Oci.DatabaseService.Responses.DeleteExternalPluggableDatabaseResponse) })]
+    public class RemoveOCIDatabaseExternalPluggableDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
+        public SwitchParameter Force { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+
+            if (!ConfirmDelete("OCIDatabaseExternalPluggableDatabase", "Remove"))
+            {
+               return;
+            }
+
+            DeleteExternalPluggableDatabaseRequest request;
+
+            try
+            {
+                request = new DeleteExternalPluggableDatabaseRequest
+                {
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(DeleteExternalPluggableDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForDeleteExternalPluggableDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.DeleteExternalPluggableDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, CreateWorkRequestObject(response.OpcWorkRequestId));
+        }
+
+        private DeleteExternalPluggableDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Update-OCIDatabaseExternalContainerDatabase.cs b/Database/Cmdlets/Update-OCIDatabaseExternalContainerDatabase.cs
new file mode 100644
index 000000000..a8c5e9b31
--- /dev/null
+++ b/Database/Cmdlets/Update-OCIDatabaseExternalContainerDatabase.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Update", "OCIDatabaseExternalContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalContainerDatabase), typeof(Oci.DatabaseService.Responses.UpdateExternalContainerDatabaseResponse) })]
+    public class UpdateOCIDatabaseExternalContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalContainerDatabase [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an CreateExternalContainerDatabaseDetails resource.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an CreateExternalContainerDatabaseDetails resource.", ParameterSetName = Default)]
+        public UpdateExternalContainerDatabaseDetails UpdateExternalContainerDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateExternalContainerDatabaseRequest request;
+
+            try
+            {
+                request = new UpdateExternalContainerDatabaseRequest
+                {
+                    ExternalContainerDatabaseId = ExternalContainerDatabaseId,
+                    UpdateExternalContainerDatabaseDetails = UpdateExternalContainerDatabaseDetails,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(UpdateExternalContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForUpdateExternalContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.UpdateExternalContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalContainerDatabase);
+        }
+
+        private UpdateExternalContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Update-OCIDatabaseExternalDatabaseConnector.cs b/Database/Cmdlets/Update-OCIDatabaseExternalDatabaseConnector.cs
new file mode 100644
index 000000000..7145d3348
--- /dev/null
+++ b/Database/Cmdlets/Update-OCIDatabaseExternalDatabaseConnector.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Update", "OCIDatabaseExternalDatabaseConnector", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalDatabaseConnector), typeof(Oci.DatabaseService.Responses.UpdateExternalDatabaseConnectorResponse) })]
+    public class UpdateOCIDatabaseExternalDatabaseConnector : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the external database connector resource (`ExternalDatabaseConnectorId`).", ParameterSetName = Default)]
+        public string ExternalDatabaseConnectorId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external database connector. This parameter also accepts subtype <Oci.DatabaseService.Models.UpdateExternalMacsConnectorDetails> of type <Oci.DatabaseService.Models.UpdateExternalDatabaseConnectorDetails>.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external database connector. This parameter also accepts subtype <Oci.DatabaseService.Models.UpdateExternalMacsConnectorDetails> of type <Oci.DatabaseService.Models.UpdateExternalDatabaseConnectorDetails>.", ParameterSetName = Default)]
+        public UpdateExternalDatabaseConnectorDetails UpdateExternalDatabaseConnectorDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateExternalDatabaseConnectorRequest request;
+
+            try
+            {
+                request = new UpdateExternalDatabaseConnectorRequest
+                {
+                    ExternalDatabaseConnectorId = ExternalDatabaseConnectorId,
+                    UpdateExternalDatabaseConnectorDetails = UpdateExternalDatabaseConnectorDetails,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(UpdateExternalDatabaseConnectorRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForUpdateExternalDatabaseConnector(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.UpdateExternalDatabaseConnector(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalDatabaseConnector);
+        }
+
+        private UpdateExternalDatabaseConnectorResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Update-OCIDatabaseExternalNonContainerDatabase.cs b/Database/Cmdlets/Update-OCIDatabaseExternalNonContainerDatabase.cs
new file mode 100644
index 000000000..50f15bfa6
--- /dev/null
+++ b/Database/Cmdlets/Update-OCIDatabaseExternalNonContainerDatabase.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Update", "OCIDatabaseExternalNonContainerDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalNonContainerDatabase), typeof(Oci.DatabaseService.Responses.UpdateExternalNonContainerDatabaseResponse) })]
+    public class UpdateOCIDatabaseExternalNonContainerDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The external non-container database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalNonContainerDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external non-container database.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external non-container database.", ParameterSetName = Default)]
+        public UpdateExternalNonContainerDatabaseDetails UpdateExternalNonContainerDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateExternalNonContainerDatabaseRequest request;
+
+            try
+            {
+                request = new UpdateExternalNonContainerDatabaseRequest
+                {
+                    ExternalNonContainerDatabaseId = ExternalNonContainerDatabaseId,
+                    UpdateExternalNonContainerDatabaseDetails = UpdateExternalNonContainerDatabaseDetails,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(UpdateExternalNonContainerDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForUpdateExternalNonContainerDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.UpdateExternalNonContainerDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalNonContainerDatabase);
+        }
+
+        private UpdateExternalNonContainerDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/Cmdlets/Update-OCIDatabaseExternalPluggableDatabase.cs b/Database/Cmdlets/Update-OCIDatabaseExternalPluggableDatabase.cs
new file mode 100644
index 000000000..13572a502
--- /dev/null
+++ b/Database/Cmdlets/Update-OCIDatabaseExternalPluggableDatabase.cs
@@ -0,0 +1,106 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.DatabaseService.Requests;
+using Oci.DatabaseService.Responses;
+using Oci.DatabaseService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.DatabaseService.Cmdlets
+{
+    [Cmdlet("Update", "OCIDatabaseExternalPluggableDatabase", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.DatabaseService.Models.ExternalPluggableDatabase), typeof(Oci.DatabaseService.Responses.UpdateExternalPluggableDatabaseResponse) })]
+    public class UpdateOCIDatabaseExternalPluggableDatabase : OCIDatabaseCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ExternalPluggableDatabaseId [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).", ParameterSetName = Default)]
+        public string ExternalPluggableDatabaseId { get; set; }
+
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external pluggable database resource.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request to update the properties of an external pluggable database resource.", ParameterSetName = Default)]
+        public UpdateExternalPluggableDatabaseDetails UpdateExternalPluggableDatabaseDetails { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.", ParameterSetName = Default)]
+        public string IfMatch { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = StatusParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier for the request.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = StatusParamSet)]
+        public WorkrequestsService.Models.WorkRequest.StatusEnum[] WaitForStatus { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = StatusParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = StatusParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateExternalPluggableDatabaseRequest request;
+
+            try
+            {
+                request = new UpdateExternalPluggableDatabaseRequest
+                {
+                    ExternalPluggableDatabaseId = ExternalPluggableDatabaseId,
+                    UpdateExternalPluggableDatabaseDetails = UpdateExternalPluggableDatabaseDetails,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(UpdateExternalPluggableDatabaseRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case StatusParamSet:
+                    response = client.Waiters.ForUpdateExternalPluggableDatabase(request, waiterConfig, WaitForStatus).Execute();
+                    break;
+
+                case Default:
+                    response = client.UpdateExternalPluggableDatabase(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.ExternalPluggableDatabase);
+        }
+
+        private UpdateExternalPluggableDatabaseResponse response;
+        private const string StatusParamSet = "StatusParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Database/OCI.PSModules.Database.psd1 b/Database/OCI.PSModules.Database.psd1
index 1d5491a6c..9b34fa27f 100644
--- a/Database/OCI.PSModules.Database.psd1
+++ b/Database/OCI.PSModules.Database.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Database.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Database.dll'
@@ -75,9 +75,15 @@ FunctionsToExport = '*'
 CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob', 
                'Confirm-OCIDatabaseVmClusterNetwork', 
                'Disable-OCIDatabaseAutonomousDatabaseOperationsInsights', 
+               'Disable-OCIDatabaseExternalContainerDatabaseDatabaseManagement', 
+               'Disable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement', 
+               'Disable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement', 
                'Enable-OCIDatabaseAutonomousDatabaseOperationsInsights', 
-               'Enable-OCIDatabaseExadataInfrastructure', 'Get-OCIDatabase', 
-               'Get-OCIDatabaseAutonomousContainerDatabase', 
+               'Enable-OCIDatabaseExadataInfrastructure', 
+               'Enable-OCIDatabaseExternalContainerDatabaseDatabaseManagement', 
+               'Enable-OCIDatabaseExternalNonContainerDatabaseDatabaseManagement', 
+               'Enable-OCIDatabaseExternalPluggableDatabaseDatabaseManagement', 
+               'Get-OCIDatabase', 'Get-OCIDatabaseAutonomousContainerDatabase', 
                'Get-OCIDatabaseAutonomousContainerDatabaseDataguardAssociation', 
                'Get-OCIDatabaseAutonomousContainerDatabaseDataguardAssociationsList', 
                'Get-OCIDatabaseAutonomousContainerDatabasesList', 
@@ -131,6 +137,14 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Get-OCIDatabaseExadataInfrastructuresList', 
                'Get-OCIDatabaseExadataIormConfig', 
                'Get-OCIDatabaseExternalBackupJob', 
+               'Get-OCIDatabaseExternalContainerDatabase', 
+               'Get-OCIDatabaseExternalContainerDatabasesList', 
+               'Get-OCIDatabaseExternalDatabaseConnector', 
+               'Get-OCIDatabaseExternalDatabaseConnectorsList', 
+               'Get-OCIDatabaseExternalNonContainerDatabase', 
+               'Get-OCIDatabaseExternalNonContainerDatabasesList', 
+               'Get-OCIDatabaseExternalPluggableDatabase', 
+               'Get-OCIDatabaseExternalPluggableDatabasesList', 
                'Get-OCIDatabaseFlexComponentsList', 
                'Get-OCIDatabaseGiVersionsList', 'Get-OCIDatabaseKeyStore', 
                'Get-OCIDatabaseKeyStoresList', 'Get-OCIDatabaseMaintenanceRun', 
@@ -146,6 +160,7 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Get-OCIDatabaseVmClusterPatchHistoryEntry', 
                'Get-OCIDatabaseVmClustersList', 
                'Invoke-OCIDatabaseAutonomousDatabaseManualRefresh', 
+               'Invoke-OCIDatabaseCheckExternalDatabaseConnectorConnectionStatus', 
                'Invoke-OCIDatabaseDbNodeAction', 
                'Invoke-OCIDatabaseDownloadExadataInfrastructureConfigFile', 
                'Invoke-OCIDatabaseDownloadVmClusterNetworkConfigFile', 
@@ -162,6 +177,7 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Invoke-OCIDatabaseRotateOrdsCerts', 
                'Invoke-OCIDatabaseRotateSslCerts', 
                'Invoke-OCIDatabaseRotateVaultKey', 
+               'Invoke-OCIDatabaseScanExternalContainerDatabasePluggableDatabases', 
                'Invoke-OCIDatabaseSwitchoverAutonomousContainerDatabaseDataguardAssociation', 
                'Invoke-OCIDatabaseSwitchoverAutonomousDatabase', 
                'Invoke-OCIDatabaseSwitchoverDataGuardAssociation', 
@@ -178,6 +194,9 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Move-OCIDatabaseCloudVmClusterCompartment', 
                'Move-OCIDatabaseDbSystemCompartment', 
                'Move-OCIDatabaseExadataInfrastructureCompartment', 
+               'Move-OCIDatabaseExternalContainerDatabaseCompartment', 
+               'Move-OCIDatabaseExternalNonContainerDatabaseCompartment', 
+               'Move-OCIDatabaseExternalPluggableDatabaseCompartment', 
                'Move-OCIDatabaseKeyStoreCompartment', 
                'Move-OCIDatabaseSoftwareImageCompartment', 
                'Move-OCIDatabaseVmClusterCompartment', 'New-OCIDatabase', 
@@ -191,7 +210,12 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'New-OCIDatabaseCloudVmCluster', 'New-OCIDatabaseConsoleConnection', 
                'New-OCIDatabaseDataGuardAssociation', 'New-OCIDatabaseDbHome', 
                'New-OCIDatabaseDbSystem', 'New-OCIDatabaseExadataInfrastructure', 
-               'New-OCIDatabaseExternalBackupJob', 'New-OCIDatabaseKeyStore', 
+               'New-OCIDatabaseExternalBackupJob', 
+               'New-OCIDatabaseExternalContainerDatabase', 
+               'New-OCIDatabaseExternalDatabaseConnector', 
+               'New-OCIDatabaseExternalNonContainerDatabase', 
+               'New-OCIDatabaseExternalPluggableDatabase', 
+               'New-OCIDatabaseKeyStore', 
                'New-OCIDatabaseRecommendedVmClusterNetwork', 
                'New-OCIDatabaseSoftwareImage', 'New-OCIDatabaseVmCluster', 
                'New-OCIDatabaseVmClusterNetwork', 
@@ -203,6 +227,10 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Remove-OCIDatabaseCloudVmCluster', 
                'Remove-OCIDatabaseConsoleConnection', 'Remove-OCIDatabaseDbHome', 
                'Remove-OCIDatabaseExadataInfrastructure', 
+               'Remove-OCIDatabaseExternalContainerDatabase', 
+               'Remove-OCIDatabaseExternalDatabaseConnector', 
+               'Remove-OCIDatabaseExternalNonContainerDatabase', 
+               'Remove-OCIDatabaseExternalPluggableDatabase', 
                'Remove-OCIDatabaseKeyStore', 'Remove-OCIDatabaseSoftwareImage', 
                'Remove-OCIDatabaseVmCluster', 'Remove-OCIDatabaseVmClusterNetwork', 
                'Restart-OCIDatabaseAutonomousContainerDatabase', 
@@ -224,8 +252,12 @@ CmdletsToExport = 'Complete-OCIDatabaseExternalBackupJob',
                'Update-OCIDatabaseCloudVmClusterIormConfig', 
                'Update-OCIDatabaseDbHome', 'Update-OCIDatabaseDbSystem', 
                'Update-OCIDatabaseExadataInfrastructure', 
-               'Update-OCIDatabaseExadataIormConfig', 'Update-OCIDatabaseKeyStore', 
-               'Update-OCIDatabaseMaintenanceRun', 
+               'Update-OCIDatabaseExadataIormConfig', 
+               'Update-OCIDatabaseExternalContainerDatabase', 
+               'Update-OCIDatabaseExternalDatabaseConnector', 
+               'Update-OCIDatabaseExternalNonContainerDatabase', 
+               'Update-OCIDatabaseExternalPluggableDatabase', 
+               'Update-OCIDatabaseKeyStore', 'Update-OCIDatabaseMaintenanceRun', 
                'Update-OCIDatabaseSoftwareImage', 'Update-OCIDatabaseVmCluster', 
                'Update-OCIDatabaseVmClusterNetwork'
 
diff --git a/Datacatalog/OCI.PSModules.Datacatalog.psd1 b/Datacatalog/OCI.PSModules.Datacatalog.psd1
index 0c4ef4a66..774590e05 100644
--- a/Datacatalog/OCI.PSModules.Datacatalog.psd1
+++ b/Datacatalog/OCI.PSModules.Datacatalog.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Datacatalog.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Datacatalog.dll'
diff --git a/Dataflow/OCI.PSModules.Dataflow.psd1 b/Dataflow/OCI.PSModules.Dataflow.psd1
index 59d0e427d..c2213d86e 100644
--- a/Dataflow/OCI.PSModules.Dataflow.psd1
+++ b/Dataflow/OCI.PSModules.Dataflow.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Dataflow.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Dataflow.dll'
diff --git a/Dataintegration/OCI.PSModules.Dataintegration.psd1 b/Dataintegration/OCI.PSModules.Dataintegration.psd1
index 036e105a9..db0ddaeee 100644
--- a/Dataintegration/OCI.PSModules.Dataintegration.psd1
+++ b/Dataintegration/OCI.PSModules.Dataintegration.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Dataintegration.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Dataintegration.dll'
diff --git a/Datasafe/OCI.PSModules.Datasafe.psd1 b/Datasafe/OCI.PSModules.Datasafe.psd1
index f6841f256..42be67cd5 100644
--- a/Datasafe/OCI.PSModules.Datasafe.psd1
+++ b/Datasafe/OCI.PSModules.Datasafe.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Datasafe.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Datasafe.dll'
diff --git a/Datascience/OCI.PSModules.Datascience.psd1 b/Datascience/OCI.PSModules.Datascience.psd1
index bb52f7e88..559fb0cbd 100644
--- a/Datascience/OCI.PSModules.Datascience.psd1
+++ b/Datascience/OCI.PSModules.Datascience.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Datascience.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Datascience.dll'
diff --git a/Directory.Build.props b/Directory.Build.props
index b71cdc1f3..4ff8678bc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SDKVersion>12.0.0</SDKVersion>
+    <SDKVersion>13.0.0</SDKVersion>
   </PropertyGroup>
 </Project>
 
diff --git a/Dns/OCI.PSModules.Dns.psd1 b/Dns/OCI.PSModules.Dns.psd1
index 9a6370881..2fdce801e 100644
--- a/Dns/OCI.PSModules.Dns.psd1
+++ b/Dns/OCI.PSModules.Dns.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Dns.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Dns.dll'
diff --git a/Dts/OCI.PSModules.Dts.psd1 b/Dts/OCI.PSModules.Dts.psd1
index 210e1ceb7..1db155c92 100644
--- a/Dts/OCI.PSModules.Dts.psd1
+++ b/Dts/OCI.PSModules.Dts.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Dts.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Dts.dll'
diff --git a/Email/OCI.PSModules.Email.psd1 b/Email/OCI.PSModules.Email.psd1
index 66eaec063..8a13e9897 100644
--- a/Email/OCI.PSModules.Email.psd1
+++ b/Email/OCI.PSModules.Email.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Email.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Email.dll'
diff --git a/Events/OCI.PSModules.Events.psd1 b/Events/OCI.PSModules.Events.psd1
index 0adf48f18..82cdc802c 100644
--- a/Events/OCI.PSModules.Events.psd1
+++ b/Events/OCI.PSModules.Events.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Events.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Events.dll'
diff --git a/Filestorage/OCI.PSModules.Filestorage.psd1 b/Filestorage/OCI.PSModules.Filestorage.psd1
index 9f3fd4e56..581e8289d 100644
--- a/Filestorage/OCI.PSModules.Filestorage.psd1
+++ b/Filestorage/OCI.PSModules.Filestorage.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Filestorage.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Filestorage.dll'
diff --git a/Functions/OCI.PSModules.Functions.psd1 b/Functions/OCI.PSModules.Functions.psd1
index 62defb13b..d7f580d79 100644
--- a/Functions/OCI.PSModules.Functions.psd1
+++ b/Functions/OCI.PSModules.Functions.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Functions.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Functions.dll'
diff --git a/Healthchecks/OCI.PSModules.Healthchecks.psd1 b/Healthchecks/OCI.PSModules.Healthchecks.psd1
index c41aa0fdb..e3bf5a669 100644
--- a/Healthchecks/OCI.PSModules.Healthchecks.psd1
+++ b/Healthchecks/OCI.PSModules.Healthchecks.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Healthchecks.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Healthchecks.dll'
diff --git a/Identity/OCI.PSModules.Identity.psd1 b/Identity/OCI.PSModules.Identity.psd1
index a6cce3aec..adc629738 100644
--- a/Identity/OCI.PSModules.Identity.psd1
+++ b/Identity/OCI.PSModules.Identity.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Identity.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Identity.dll'
diff --git a/Integration/OCI.PSModules.Integration.psd1 b/Integration/OCI.PSModules.Integration.psd1
index 397d12ce7..d86e75ff6 100644
--- a/Integration/OCI.PSModules.Integration.psd1
+++ b/Integration/OCI.PSModules.Integration.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Integration.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Integration.dll'
diff --git a/Keymanagement/OCI.PSModules.Keymanagement.psd1 b/Keymanagement/OCI.PSModules.Keymanagement.psd1
index f53304cff..4f6a74741 100644
--- a/Keymanagement/OCI.PSModules.Keymanagement.psd1
+++ b/Keymanagement/OCI.PSModules.Keymanagement.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Keymanagement.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Keymanagement.dll'
diff --git a/Limits/OCI.PSModules.Limits.psd1 b/Limits/OCI.PSModules.Limits.psd1
index a84234b23..69fde00a5 100644
--- a/Limits/OCI.PSModules.Limits.psd1
+++ b/Limits/OCI.PSModules.Limits.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Limits.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Limits.dll'
diff --git a/Loadbalancer/OCI.PSModules.Loadbalancer.psd1 b/Loadbalancer/OCI.PSModules.Loadbalancer.psd1
index c3a92909f..092380487 100644
--- a/Loadbalancer/OCI.PSModules.Loadbalancer.psd1
+++ b/Loadbalancer/OCI.PSModules.Loadbalancer.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Loadbalancer.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Loadbalancer.dll'
diff --git a/Loganalytics/OCI.PSModules.Loganalytics.psd1 b/Loganalytics/OCI.PSModules.Loganalytics.psd1
index db032290c..6728a898f 100644
--- a/Loganalytics/OCI.PSModules.Loganalytics.psd1
+++ b/Loganalytics/OCI.PSModules.Loganalytics.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Loganalytics.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Loganalytics.dll'
diff --git a/Logging/OCI.PSModules.Logging.psd1 b/Logging/OCI.PSModules.Logging.psd1
index 64ac6a55b..4ee608697 100644
--- a/Logging/OCI.PSModules.Logging.psd1
+++ b/Logging/OCI.PSModules.Logging.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Logging.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Logging.dll'
diff --git a/Loggingingestion/OCI.PSModules.Loggingingestion.psd1 b/Loggingingestion/OCI.PSModules.Loggingingestion.psd1
index de59884ff..923330b35 100644
--- a/Loggingingestion/OCI.PSModules.Loggingingestion.psd1
+++ b/Loggingingestion/OCI.PSModules.Loggingingestion.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Loggingingestion.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Loggingingestion.dll'
diff --git a/Loggingsearch/OCI.PSModules.Loggingsearch.psd1 b/Loggingsearch/OCI.PSModules.Loggingsearch.psd1
index 268bd1029..86d3589f5 100644
--- a/Loggingsearch/OCI.PSModules.Loggingsearch.psd1
+++ b/Loggingsearch/OCI.PSModules.Loggingsearch.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Loggingsearch.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Loggingsearch.dll'
diff --git a/Managementagent/OCI.PSModules.Managementagent.psd1 b/Managementagent/OCI.PSModules.Managementagent.psd1
index bacf0d2fe..c619abab0 100644
--- a/Managementagent/OCI.PSModules.Managementagent.psd1
+++ b/Managementagent/OCI.PSModules.Managementagent.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Managementagent.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Managementagent.dll'
diff --git a/Managementdashboard/OCI.PSModules.Managementdashboard.psd1 b/Managementdashboard/OCI.PSModules.Managementdashboard.psd1
index 3ec136523..ba76572ad 100644
--- a/Managementdashboard/OCI.PSModules.Managementdashboard.psd1
+++ b/Managementdashboard/OCI.PSModules.Managementdashboard.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Managementdashboard.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Managementdashboard.dll'
diff --git a/Marketplace/OCI.PSModules.Marketplace.psd1 b/Marketplace/OCI.PSModules.Marketplace.psd1
index 6f13e0564..6418fd645 100644
--- a/Marketplace/OCI.PSModules.Marketplace.psd1
+++ b/Marketplace/OCI.PSModules.Marketplace.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Marketplace.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Marketplace.dll'
diff --git a/Monitoring/OCI.PSModules.Monitoring.psd1 b/Monitoring/OCI.PSModules.Monitoring.psd1
index cf11d7940..a8db0035a 100644
--- a/Monitoring/OCI.PSModules.Monitoring.psd1
+++ b/Monitoring/OCI.PSModules.Monitoring.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Monitoring.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Monitoring.dll'
diff --git a/Mysql/OCI.PSModules.Mysql.psd1 b/Mysql/OCI.PSModules.Mysql.psd1
index e39a49070..c0463797c 100644
--- a/Mysql/OCI.PSModules.Mysql.psd1
+++ b/Mysql/OCI.PSModules.Mysql.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Mysql.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Mysql.dll'
diff --git a/Nosql/OCI.PSModules.Nosql.psd1 b/Nosql/OCI.PSModules.Nosql.psd1
index aed88d4a1..98aa0a82f 100644
--- a/Nosql/OCI.PSModules.Nosql.psd1
+++ b/Nosql/OCI.PSModules.Nosql.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Nosql.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Nosql.dll'
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageBucket.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageBucket.cs
index 0c5ba77a2..bb742444f 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageBucket.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageBucket.cs
@@ -24,10 +24,10 @@ public class GetOCIObjectstorageBucket : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageBucketsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageBucketsList.cs
index 422faef96..9288d35b3 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageBucketsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageBucketsList.cs
@@ -26,10 +26,10 @@ public class GetOCIObjectstorageBucketsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ID of the compartment in which to list buckets.")]
         public string CompartmentId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Bucket summary in list of buckets includes the 'namespace', 'name', 'compartmentId', 'createdBy', 'timeCreated', and 'etag' fields. This parameter can also include 'tags' (freeformTags and definedTags). The only supported value of this parameter is 'tags' for now. Example 'tags'.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadPartsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadPartsList.cs
index bc600a8e9..99ef8de60 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadPartsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadPartsList.cs
@@ -32,10 +32,10 @@ public class GetOCIObjectstorageMultipartUploadPartsList : OCIObjectStorageCmdle
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The upload ID for a multipart upload.")]
         public string UploadId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadsList.cs
index ae6fed07b..95a445c4d 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageMultipartUploadsList.cs
@@ -26,10 +26,10 @@ public class GetOCIObjectstorageMultipartUploadsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageObject.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageObject.cs
index 76feae100..9c121aebc 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageObject.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageObject.cs
@@ -34,10 +34,10 @@ public class GetOCIObjectstorageObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"VersionId used to identify a particular version of the object")]
         public string VersionId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectVersionsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectVersionsList.cs
index b382de9d1..381690a87 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectVersionsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectVersionsList.cs
@@ -35,13 +35,13 @@ public class GetOCIObjectstorageObjectVersionsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object names returned by a list query must be strictly less than this parameter.")]
         public string End { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"When this parameter is set, only objects whose names do not contain the delimiter character (after an optionally specified prefix) are returned in the objects key of the response body. Scanned objects whose names contain the delimiter have the part of their name up to the first occurrence of the delimiter (including the optional prefix) returned as a set of prefixes. Note that only '/' is a supported delimiter character at this time.")]
         public string Delimiter { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object summary in list of objects includes the 'name' field. This parameter can also include 'size' (object size in bytes), 'etag', 'md5', 'timeCreated' (object creation date and time) and 'timeModified' (object modification date and time). Value of this parameter should be a comma-separated, case-insensitive list of those field names. For example 'name,etag,timeCreated,md5,timeModified'")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object summary by default includes only the 'name' field. Use this parameter to also include 'size' (object size in bytes), 'etag', 'md5', 'timeCreated' (object creation date and time), 'timeModified' (object modification date and time), 'storageTier' and 'archivalState' fields. Specify the value of this parameter as a comma-separated, case-insensitive list of those field names. For example 'name,etag,timeCreated,md5,timeModified,storageTier,archivalState'.")]
         public System.Nullable<Oci.ObjectstorageService.Requests.ListObjectVersionsRequest.FieldsEnum> Fields { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
@@ -50,7 +50,7 @@ public class GetOCIObjectstorageObjectVersionsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object names returned by a list query must be greater than this parameter.")]
         public string StartAfter { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectsList.cs
index 44ba59819..b33d31209 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageObjectsList.cs
@@ -35,13 +35,13 @@ public class GetOCIObjectstorageObjectsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object names returned by a list query must be strictly less than this parameter.")]
         public string End { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"When this parameter is set, only objects whose names do not contain the delimiter character (after an optionally specified prefix) are returned in the objects key of the response body. Scanned objects whose names contain the delimiter have the part of their name up to the first occurrence of the delimiter (including the optional prefix) returned as a set of prefixes. Note that only '/' is a supported delimiter character at this time.")]
         public string Delimiter { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object summary in list of objects includes the 'name' field. This parameter can also include 'size' (object size in bytes), 'etag', 'md5', 'timeCreated' (object creation date and time) and 'timeModified' (object modification date and time). Value of this parameter should be a comma-separated, case-insensitive list of those field names. For example 'name,etag,timeCreated,md5,timeModified'")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Object summary by default includes only the 'name' field. Use this parameter to also include 'size' (object size in bytes), 'etag', 'md5', 'timeCreated' (object creation date and time), 'timeModified' (object modification date and time), 'storageTier' and 'archivalState' fields. Specify the value of this parameter as a comma-separated, case-insensitive list of those field names. For example 'name,etag,timeCreated,md5,timeModified,storageTier,archivalState'.")]
         public System.Nullable<Oci.ObjectstorageService.Requests.ListObjectsRequest.FieldsEnum> Fields { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstoragePreauthenticatedRequestsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstoragePreauthenticatedRequestsList.cs
index a23be2b68..6bdf3588c 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstoragePreauthenticatedRequestsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstoragePreauthenticatedRequestsList.cs
@@ -29,10 +29,10 @@ public class GetOCIObjectstoragePreauthenticatedRequestsList : OCIObjectStorageC
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"User-specified object name prefixes can be used to query and return a list of pre-authenticated requests.")]
         public string ObjectNamePrefix { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationPoliciesList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationPoliciesList.cs
index ad73434f9..7226fa96a 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationPoliciesList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationPoliciesList.cs
@@ -29,10 +29,10 @@ public class GetOCIObjectstorageReplicationPoliciesList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationSourcesList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationSourcesList.cs
index ec1226d57..73d44729f 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationSourcesList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageReplicationSourcesList.cs
@@ -29,10 +29,10 @@ public class GetOCIObjectstorageReplicationSourcesList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageRetentionRulesList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageRetentionRulesList.cs
index 29ce23f8e..41dd339f6 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageRetentionRulesList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageRetentionRulesList.cs
@@ -26,7 +26,7 @@ public class GetOCIObjectstorageRetentionRulesList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestErrorsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestErrorsList.cs
index 5ef4a3c2d..3dc69d24e 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestErrorsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestErrorsList.cs
@@ -23,10 +23,10 @@ public class GetOCIObjectstorageWorkRequestErrorsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ID of the asynchronous request.")]
         public string WorkRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestLogsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestLogsList.cs
index 91e4b1444..ffd8feded 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestLogsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestLogsList.cs
@@ -23,10 +23,10 @@ public class GetOCIObjectstorageWorkRequestLogsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ID of the asynchronous request.")]
         public string WorkRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestsList.cs b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestsList.cs
index cf4a215cd..dd4f67e33 100644
--- a/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestsList.cs
+++ b/Objectstorage/Cmdlets/Get-OCIObjectstorageWorkRequestsList.cs
@@ -26,10 +26,10 @@ public class GetOCIObjectstorageWorkRequestsList : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The page at which to start retrieving results.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The value of the `opc-next-page` response header from the previous ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
         public string Page { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The maximum number of items to return.", ParameterSetName = LimitSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For list pagination. The maximum number of results per page, or items to return in a paginated ""List"" call. For important details about how pagination works, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
         public System.Nullable<int> Limit { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
diff --git a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageCommitMultipartUpload.cs b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageCommitMultipartUpload.cs
index ca47b34f1..807fe6d40 100644
--- a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageCommitMultipartUpload.cs
+++ b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageCommitMultipartUpload.cs
@@ -33,10 +33,10 @@ public class InvokeOCIObjectstorageCommitMultipartUpload : OCIObjectStorageCmdle
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The part numbers and entity tags (ETags) for the parts you want to commit.")]
         public CommitMultipartUploadDetails CommitMultipartUploadDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadBucket.cs b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadBucket.cs
index b79041602..502a4d904 100644
--- a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadBucket.cs
+++ b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadBucket.cs
@@ -24,10 +24,10 @@ public class InvokeOCIObjectstorageHeadBucket : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadObject.cs b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadObject.cs
index 1874e0008..56f8a22eb 100644
--- a/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadObject.cs
+++ b/Objectstorage/Cmdlets/Invoke-OCIObjectstorageHeadObject.cs
@@ -30,10 +30,10 @@ public class InvokeOCIObjectstorageHeadObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"VersionId used to identify a particular version of the object")]
         public string VersionId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/New-OCIObjectstorageMultipartUpload.cs b/Objectstorage/Cmdlets/New-OCIObjectstorageMultipartUpload.cs
index 4b6623071..f80672331 100644
--- a/Objectstorage/Cmdlets/New-OCIObjectstorageMultipartUpload.cs
+++ b/Objectstorage/Cmdlets/New-OCIObjectstorageMultipartUpload.cs
@@ -27,10 +27,10 @@ public class NewOCIObjectstorageMultipartUpload : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request object for creating a multipart upload.")]
         public CreateMultipartUploadDetails CreateMultipartUploadDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Remove-OCIObjectstorageBucket.cs b/Objectstorage/Cmdlets/Remove-OCIObjectstorageBucket.cs
index e00092d6d..e014323e2 100644
--- a/Objectstorage/Cmdlets/Remove-OCIObjectstorageBucket.cs
+++ b/Objectstorage/Cmdlets/Remove-OCIObjectstorageBucket.cs
@@ -24,7 +24,7 @@ public class RemoveOCIObjectstorageBucket : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Remove-OCIObjectstorageObject.cs b/Objectstorage/Cmdlets/Remove-OCIObjectstorageObject.cs
index d80911736..fc3b2f4b7 100644
--- a/Objectstorage/Cmdlets/Remove-OCIObjectstorageObject.cs
+++ b/Objectstorage/Cmdlets/Remove-OCIObjectstorageObject.cs
@@ -27,7 +27,7 @@ public class RemoveOCIObjectstorageObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the object. Avoid entering confidential information. Example: `test/object1.log`")]
         public string ObjectName { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Remove-OCIObjectstorageObjectLifecyclePolicy.cs b/Objectstorage/Cmdlets/Remove-OCIObjectstorageObjectLifecyclePolicy.cs
index 4d4f8a26e..0d8f41498 100644
--- a/Objectstorage/Cmdlets/Remove-OCIObjectstorageObjectLifecyclePolicy.cs
+++ b/Objectstorage/Cmdlets/Remove-OCIObjectstorageObjectLifecyclePolicy.cs
@@ -27,7 +27,7 @@ public class RemoveOCIObjectstorageObjectLifecyclePolicy : OCIObjectStorageCmdle
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
diff --git a/Objectstorage/Cmdlets/Remove-OCIObjectstorageRetentionRule.cs b/Objectstorage/Cmdlets/Remove-OCIObjectstorageRetentionRule.cs
index 46ba84f3d..39e6ccb13 100644
--- a/Objectstorage/Cmdlets/Remove-OCIObjectstorageRetentionRule.cs
+++ b/Objectstorage/Cmdlets/Remove-OCIObjectstorageRetentionRule.cs
@@ -27,7 +27,7 @@ public class RemoveOCIObjectstorageRetentionRule : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The ID of the retention rule.")]
         public string RetentionRuleId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Rename-OCIObjectstorageObject.cs b/Objectstorage/Cmdlets/Rename-OCIObjectstorageObject.cs
index c5001ff09..917b4ac33 100644
--- a/Objectstorage/Cmdlets/Rename-OCIObjectstorageObject.cs
+++ b/Objectstorage/Cmdlets/Rename-OCIObjectstorageObject.cs
@@ -24,7 +24,7 @@ public class RenameOCIObjectstorageObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
         public string BucketName { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sourceName and newName of rename operation.")]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sourceName and newName of rename operation. Avoid entering confidential information.")]
         public RenameObjectDetails RenameObjectDetails { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Update-OCIObjectstorageBucket.cs b/Objectstorage/Cmdlets/Update-OCIObjectstorageBucket.cs
index 96e5f0247..b7a3e1fd5 100644
--- a/Objectstorage/Cmdlets/Update-OCIObjectstorageBucket.cs
+++ b/Objectstorage/Cmdlets/Update-OCIObjectstorageBucket.cs
@@ -27,7 +27,7 @@ public class UpdateOCIObjectstorageBucket : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request object for updating a bucket.")]
         public UpdateBucketDetails UpdateBucketDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Update-OCIObjectstorageRetentionRule.cs b/Objectstorage/Cmdlets/Update-OCIObjectstorageRetentionRule.cs
index 667121390..a3674cfef 100644
--- a/Objectstorage/Cmdlets/Update-OCIObjectstorageRetentionRule.cs
+++ b/Objectstorage/Cmdlets/Update-OCIObjectstorageRetentionRule.cs
@@ -30,7 +30,7 @@ public class UpdateOCIObjectstorageRetentionRule : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Request object for updating the retention rule.")]
         public UpdateRetentionRuleDetails UpdateRetentionRuleDetails { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
diff --git a/Objectstorage/Cmdlets/Update-OCIObjectstorageTier.cs b/Objectstorage/Cmdlets/Update-OCIObjectstorageTier.cs
new file mode 100644
index 000000000..b4174709f
--- /dev/null
+++ b/Objectstorage/Cmdlets/Update-OCIObjectstorageTier.cs
@@ -0,0 +1,66 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20160918
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ObjectstorageService.Requests;
+using Oci.ObjectstorageService.Responses;
+using Oci.ObjectstorageService.Models;
+
+namespace Oci.ObjectstorageService.Cmdlets
+{
+    [Cmdlet("Update", "OCIObjectstorageTier")]
+    [OutputType(new System.Type[] { typeof(void), typeof(Oci.ObjectstorageService.Responses.UpdateObjectStorageTierResponse) })]
+    public class UpdateOCIObjectstorageTier : OCIObjectStorageCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The Object Storage namespace used for the request.")]
+        public string NamespaceName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The name of the bucket. Avoid entering confidential information. Example: `my-new-bucket1`")]
+        public string BucketName { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The object name and the desired storage tier.")]
+        public UpdateObjectStorageTierDetails UpdateObjectStorageTierDetails { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
+        public string OpcClientRequestId { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateObjectStorageTierRequest request;
+
+            try
+            {
+                request = new UpdateObjectStorageTierRequest
+                {
+                    NamespaceName = NamespaceName,
+                    BucketName = BucketName,
+                    UpdateObjectStorageTierDetails = UpdateObjectStorageTierDetails,
+                    OpcClientRequestId = OpcClientRequestId
+                };
+
+                response = client.UpdateObjectStorageTier(request).GetAwaiter().GetResult();
+                WriteOutput(response);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private UpdateObjectStorageTierResponse response;
+    }
+}
diff --git a/Objectstorage/Cmdlets/Write-OCIObjectstorageObject.cs b/Objectstorage/Cmdlets/Write-OCIObjectstorageObject.cs
index fabd11dba..453e3828c 100644
--- a/Objectstorage/Cmdlets/Write-OCIObjectstorageObject.cs
+++ b/Objectstorage/Cmdlets/Write-OCIObjectstorageObject.cs
@@ -36,10 +36,10 @@ public class WriteOCIObjectstorageObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Use this parameter to provide the file location from where the input stream to be read. The object to upload to the object store.", ParameterSetName = FromFileSet)]
         public String PutObjectBodyFromFile { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
@@ -77,6 +77,9 @@ public class WriteOCIObjectstorageObject : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The optional header that specifies the base64-encoded SHA256 hash of the encryption key. This value is used to check the integrity of the encryption key. For more information, see [Using Your Own Keys for Server-Side Encryption](https://docs.cloud.oracle.com/Content/Object/Tasks/usingyourencryptionkeys.htm).")]
         public string OpcSseCustomerKeySha256 { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The storage tier that the object should be stored in. If not specified, the object will be stored in the same storage tier as the bucket.")]
+        public System.Nullable<Oci.ObjectstorageService.Models.StorageTier> StorageTier { get; set; }
+
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Optional user-defined metadata key and value.")]
         public System.Collections.Generic.Dictionary<string, string> OpcMeta { get; set; }
 
@@ -113,6 +116,7 @@ protected override void ProcessRecord()
                     OpcSseCustomerAlgorithm = OpcSseCustomerAlgorithm,
                     OpcSseCustomerKey = OpcSseCustomerKey,
                     OpcSseCustomerKeySha256 = OpcSseCustomerKeySha256,
+                    StorageTier = StorageTier,
                     OpcMeta = OpcMeta
                 };
 
diff --git a/Objectstorage/Cmdlets/Write-OCIObjectstorageObjectLifecyclePolicy.cs b/Objectstorage/Cmdlets/Write-OCIObjectstorageObjectLifecyclePolicy.cs
index 429a6cd61..b9104099d 100644
--- a/Objectstorage/Cmdlets/Write-OCIObjectstorageObjectLifecyclePolicy.cs
+++ b/Objectstorage/Cmdlets/Write-OCIObjectstorageObjectLifecyclePolicy.cs
@@ -30,10 +30,10 @@ public class WriteOCIObjectstorageObjectLifecyclePolicy : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         protected override void ProcessRecord()
diff --git a/Objectstorage/Cmdlets/Write-OCIObjectstoragePart.cs b/Objectstorage/Cmdlets/Write-OCIObjectstoragePart.cs
index 2145fa992..0f7dcc426 100644
--- a/Objectstorage/Cmdlets/Write-OCIObjectstoragePart.cs
+++ b/Objectstorage/Cmdlets/Write-OCIObjectstoragePart.cs
@@ -45,10 +45,10 @@ public class WriteOCIObjectstoragePart : OCIObjectStorageCmdlet
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The client request ID for tracing.")]
         public string OpcClientRequestId { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match. For creating and committing a multipart upload to an object, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to match with the ETag of an existing resource. If the specified ETag matches the ETag of the existing resource, GET and HEAD requests will return the resource and PUT and POST requests will upload the resource.")]
         public string IfMatch { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the object already exists. For creating and committing a multipart upload, this is the entity tag of the target object. For uploading a part, this is the entity tag of the target part.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The entity tag (ETag) to avoid matching. The only valid value is '*', which indicates that the request should fail if the resource already exists.")]
         public string IfNoneMatch { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"100-continue")]
diff --git a/Objectstorage/OCI.PSModules.Objectstorage.psd1 b/Objectstorage/OCI.PSModules.Objectstorage.psd1
index fce8922c7..554add5ef 100644
--- a/Objectstorage/OCI.PSModules.Objectstorage.psd1
+++ b/Objectstorage/OCI.PSModules.Objectstorage.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Objectstorage.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Objectstorage.dll'
@@ -114,7 +114,7 @@ CmdletsToExport = 'Copy-OCIObjectstorageObject', 'Get-OCIObjectstorageBucket',
                'Stop-OCIObjectstorageWorkRequest', 'Update-OCIObjectstorageBucket', 
                'Update-OCIObjectstorageNamespaceMetadata', 
                'Update-OCIObjectstorageRetentionRule', 
-               'Write-OCIObjectstorageObject', 
+               'Update-OCIObjectstorageTier', 'Write-OCIObjectstorageObject', 
                'Write-OCIObjectstorageObjectLifecyclePolicy', 
                'Write-OCIObjectstoragePart'
 
diff --git a/Oce/OCI.PSModules.Oce.psd1 b/Oce/OCI.PSModules.Oce.psd1
index 0dcd59315..db2d41a3e 100644
--- a/Oce/OCI.PSModules.Oce.psd1
+++ b/Oce/OCI.PSModules.Oce.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Oce.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Oce.dll'
diff --git a/Ocvp/OCI.PSModules.Ocvp.psd1 b/Ocvp/OCI.PSModules.Ocvp.psd1
index 446417b2e..bb298171f 100644
--- a/Ocvp/OCI.PSModules.Ocvp.psd1
+++ b/Ocvp/OCI.PSModules.Ocvp.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Ocvp.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Ocvp.dll'
diff --git a/Oda/OCI.PSModules.Oda.psd1 b/Oda/OCI.PSModules.Oda.psd1
index ec5069f6b..0d61d4be3 100644
--- a/Oda/OCI.PSModules.Oda.psd1
+++ b/Oda/OCI.PSModules.Oda.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Oda.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Oda.dll'
diff --git a/Ons/OCI.PSModules.Ons.psd1 b/Ons/OCI.PSModules.Ons.psd1
index aa19a7053..061c7fdac 100644
--- a/Ons/OCI.PSModules.Ons.psd1
+++ b/Ons/OCI.PSModules.Ons.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Ons.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Ons.dll'
diff --git a/Opsi/OCI.PSModules.Opsi.psd1 b/Opsi/OCI.PSModules.Opsi.psd1
index 22c291fc6..6c68378e7 100644
--- a/Opsi/OCI.PSModules.Opsi.psd1
+++ b/Opsi/OCI.PSModules.Opsi.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Opsi.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Opsi.dll'
diff --git a/Optimizer/OCI.PSModules.Optimizer.psd1 b/Optimizer/OCI.PSModules.Optimizer.psd1
index 13e355bfa..b537a6403 100644
--- a/Optimizer/OCI.PSModules.Optimizer.psd1
+++ b/Optimizer/OCI.PSModules.Optimizer.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Optimizer.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Optimizer.dll'
diff --git a/Osmanagement/OCI.PSModules.Osmanagement.psd1 b/Osmanagement/OCI.PSModules.Osmanagement.psd1
index 3baaa8b9e..aad702c3a 100644
--- a/Osmanagement/OCI.PSModules.Osmanagement.psd1
+++ b/Osmanagement/OCI.PSModules.Osmanagement.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Osmanagement.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Osmanagement.dll'
diff --git a/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplate.cs b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplate.cs
new file mode 100644
index 000000000..09b7a3031
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplate.cs
@@ -0,0 +1,94 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+using Oci.Common.Waiters;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Get", "OCIResourcemanagerTemplate", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(Oci.ResourcemanagerService.Models.Template), typeof(Oci.ResourcemanagerService.Responses.GetTemplateResponse) })]
+    public class GetOCIResourcemanagerTemplate : OCIResourceManagerCmdlet
+    {
+        
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.", ParameterSetName = Default)]
+        public string TemplateId { get; set; }
+
+        
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.", ParameterSetName = LifecycleStateParamSet)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.", ParameterSetName = Default)]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = @"This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state.", ParameterSetName = LifecycleStateParamSet)]
+        public Oci.ResourcemanagerService.Models.Template.LifecycleStateEnum[] WaitForLifecycleState { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = @"Check every WaitIntervalSeconds to see whether the resource has reached a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int WaitIntervalSeconds { get; set; } = WAIT_INTERVAL_SECONDS;
+
+        [Parameter(Mandatory = false, HelpMessage = @"Maximum number of attempts to be made until the resource reaches a desired state.", ParameterSetName = LifecycleStateParamSet)]
+        public int MaxWaitAttempts { get; set; } = MAX_WAITER_ATTEMPTS;
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetTemplateRequest request;
+
+            try
+            {
+                request = new GetTemplateRequest
+                {
+                    TemplateId = TemplateId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                HandleOutput(request);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput(GetTemplateRequest request)
+        {
+            var waiterConfig = new WaiterConfiguration
+            {
+                MaxAttempts = MaxWaitAttempts,
+                GetNextDelayInSeconds = (_) => WaitIntervalSeconds
+            };
+
+            switch (ParameterSetName)
+            { 
+                case LifecycleStateParamSet:
+                    response = client.Waiters.ForTemplate(request, waiterConfig, WaitForLifecycleState).Execute();
+                    break;
+
+                case Default:
+                    response = client.GetTemplate(request).GetAwaiter().GetResult();
+                    break;
+            }
+            WriteOutput(response, response.Template);
+        }
+
+        private GetTemplateResponse response;
+        private const string LifecycleStateParamSet = "LifecycleStateParamSet";
+        private const string Default = "Default";
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateCategoriesList.cs b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateCategoriesList.cs
new file mode 100644
index 000000000..acd40a675
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateCategoriesList.cs
@@ -0,0 +1,54 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Get", "OCIResourcemanagerTemplateCategoriesList")]
+    [OutputType(new System.Type[] { typeof(Oci.ResourcemanagerService.Models.TemplateCategorySummaryCollection), typeof(Oci.ResourcemanagerService.Responses.ListTemplateCategoriesResponse) })]
+    public class GetOCIResourcemanagerTemplateCategoriesList : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListTemplateCategoriesRequest request;
+
+            try
+            {
+                request = new ListTemplateCategoriesRequest
+                {
+                    OpcRequestId = OpcRequestId
+                };
+
+                response = client.ListTemplateCategories(request).GetAwaiter().GetResult();
+                WriteOutput(response, response.TemplateCategorySummaryCollection);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private ListTemplateCategoriesResponse response;
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateLogo.cs b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateLogo.cs
new file mode 100644
index 000000000..66e9a92c1
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateLogo.cs
@@ -0,0 +1,84 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    /*
+     * As per https://github.com/PowerShell/PowerShell/issues/11143, this cmdlet is marked with a default parameter set for proper resolution of the invoked parameter set.
+     * Parameter set "Default" contains all the parameters that are defined in this class(including base classes) and are not explicitly tagged with a ParameterSetName.
+     */
+    [Cmdlet("Get", "OCIResourcemanagerTemplateLogo", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(System.IO.Stream), typeof(void), typeof(Oci.ResourcemanagerService.Responses.GetTemplateLogoResponse) })]
+    public class GetOCIResourcemanagerTemplateLogo : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Path to the output file.", ParameterSetName = WriteToFileSet)]
+        public string OutputFile { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Output the complete response returned by the API Operation. Using this switch will make this Cmdlet output an object containing response headers in-addition to an optional response body.", ParameterSetName = FullResponseSet)]
+        public override SwitchParameter FullResponse { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetTemplateLogoRequest request;
+
+            try
+            {
+                request = new GetTemplateLogoRequest
+                {
+                    TemplateId = TemplateId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                response = client.GetTemplateLogo(request).GetAwaiter().GetResult();
+                HandleOutput();
+                
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput()
+        {
+            if (ParameterSetName.Equals(WriteToFileSet))
+            {
+                WriteToOutputFile(OutputFile, response.InputStream);
+            }
+            else
+            {
+                WriteOutput(response, response.InputStream);
+            }
+        }
+
+        private GetTemplateLogoResponse response;
+        private const string Default = "Default";
+        private const string WriteToFileSet = "WriteToFile";
+        private const string FullResponseSet = "FullResponse";
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateTfConfig.cs b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateTfConfig.cs
new file mode 100644
index 000000000..415131a1a
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplateTfConfig.cs
@@ -0,0 +1,84 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    /*
+     * As per https://github.com/PowerShell/PowerShell/issues/11143, this cmdlet is marked with a default parameter set for proper resolution of the invoked parameter set.
+     * Parameter set "Default" contains all the parameters that are defined in this class(including base classes) and are not explicitly tagged with a ParameterSetName.
+     */
+    [Cmdlet("Get", "OCIResourcemanagerTemplateTfConfig", DefaultParameterSetName = Default)]
+    [OutputType(new System.Type[] { typeof(System.IO.Stream), typeof(void), typeof(Oci.ResourcemanagerService.Responses.GetTemplateTfConfigResponse) })]
+    public class GetOCIResourcemanagerTemplateTfConfig : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Path to the output file.", ParameterSetName = WriteToFileSet)]
+        public string OutputFile { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Output the complete response returned by the API Operation. Using this switch will make this Cmdlet output an object containing response headers in-addition to an optional response body.", ParameterSetName = FullResponseSet)]
+        public override SwitchParameter FullResponse { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            GetTemplateTfConfigRequest request;
+
+            try
+            {
+                request = new GetTemplateTfConfigRequest
+                {
+                    TemplateId = TemplateId,
+                    OpcRequestId = OpcRequestId
+                };
+
+                response = client.GetTemplateTfConfig(request).GetAwaiter().GetResult();
+                HandleOutput();
+                
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private void HandleOutput()
+        {
+            if (ParameterSetName.Equals(WriteToFileSet))
+            {
+                WriteToOutputFile(OutputFile, response.InputStream);
+            }
+            else
+            {
+                WriteOutput(response, response.InputStream);
+            }
+        }
+
+        private GetTemplateTfConfigResponse response;
+        private const string Default = "Default";
+        private const string WriteToFileSet = "WriteToFile";
+        private const string FullResponseSet = "FullResponse";
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplatesList.cs b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplatesList.cs
new file mode 100644
index 000000000..7a86b52ef
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Get-OCIResourcemanagerTemplatesList.cs
@@ -0,0 +1,111 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Get", "OCIResourcemanagerTemplatesList")]
+    [OutputType(new System.Type[] { typeof(Oci.ResourcemanagerService.Models.TemplateSummaryCollection), typeof(Oci.ResourcemanagerService.Responses.ListTemplatesResponse) })]
+    public class GetOCIResourcemanagerTemplatesList : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that exist in the compartment, identified by [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).")]
+        public string CompartmentId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique identifier of the template category.")]
+        public string TemplateCategoryId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A filter to return only resources that match the specified display name.")]
+        public string DisplayName { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The field to use when sorting returned resources. By default, `TIMECREATED` is ordered descending. By default, `DISPLAYNAME` is ordered ascending. Note that you can sort only on one field.")]
+        public System.Nullable<Oci.ResourcemanagerService.Requests.ListTemplatesRequest.SortByEnum> SortBy { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The sort order to use when sorting returned resources. Ascending (`ASC`) or descending (`DESC`).")]
+        public System.Nullable<Oci.ResourcemanagerService.Requests.ListTemplatesRequest.SortOrderEnum> SortOrder { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The number of items returned in a paginated `List` call. For information about pagination, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).", ParameterSetName = LimitSet)]
+        public System.Nullable<int> Limit { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"The value of the `opc-next-page` response header from the preceding `List` call. For information about pagination, see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).")]
+        public string Page { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"Fetches all pages of results.", ParameterSetName = AllPageSet)]
+        public SwitchParameter All { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ListTemplatesRequest request;
+
+            try
+            {
+                request = new ListTemplatesRequest
+                {
+                    OpcRequestId = OpcRequestId,
+                    CompartmentId = CompartmentId,
+                    TemplateCategoryId = TemplateCategoryId,
+                    TemplateId = TemplateId,
+                    DisplayName = DisplayName,
+                    SortBy = SortBy,
+                    SortOrder = SortOrder,
+                    Limit = Limit,
+                    Page = Page
+                };
+                IEnumerable<ListTemplatesResponse> responses = GetRequestDelegate().Invoke(request);
+                foreach (var item in responses)
+                {
+                    response = item;
+                    WriteOutput(response, response.TemplateSummaryCollection, true);
+                }
+                if(!ParameterSetName.Equals(AllPageSet) && response.OpcNextPage != null)
+                {
+                    WriteWarning("This operation supports pagination and not all resources were returned.  Re-run using the -all option to auto paginate and list all resources.");
+                }
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private RequestDelegate GetRequestDelegate()
+        {
+            IEnumerable<ListTemplatesResponse> DefaultRequest(ListTemplatesRequest request) => Enumerable.Repeat(client.ListTemplates(request).GetAwaiter().GetResult(), 1);
+            if (ParameterSetName.Equals(AllPageSet))
+            {
+                return req => client.Paginators.ListTemplatesResponseEnumerator(req);
+            }
+            return DefaultRequest;
+        }
+
+        private ListTemplatesResponse response;
+        private delegate IEnumerable<ListTemplatesResponse> RequestDelegate(ListTemplatesRequest request);
+        private const string AllPageSet = "AllPages";
+        private const string LimitSet = "Limit";
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Move-OCIResourcemanagerTemplateCompartment.cs b/Resourcemanager/Cmdlets/Move-OCIResourcemanagerTemplateCompartment.cs
new file mode 100644
index 000000000..2ce23e71d
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Move-OCIResourcemanagerTemplateCompartment.cs
@@ -0,0 +1,70 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Move", "OCIResourcemanagerTemplateCompartment")]
+    [OutputType(new System.Type[] { typeof(void), typeof(Oci.ResourcemanagerService.Responses.ChangeTemplateCompartmentResponse) })]
+    public class MoveOCIResourcemanagerTemplateCompartment : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The details for moving a template to a different compartment.")]
+        public ChangeTemplateCompartmentDetails ChangeTemplateCompartmentDetails { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the `PUT` or `DELETE` call for a resource, set the `if-match` parameter to the value of the etag from a previous `GET` or `POST` response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of retrying the same action. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations. For example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected.")]
+        public string OpcRetryToken { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            ChangeTemplateCompartmentRequest request;
+
+            try
+            {
+                request = new ChangeTemplateCompartmentRequest
+                {
+                    TemplateId = TemplateId,
+                    ChangeTemplateCompartmentDetails = ChangeTemplateCompartmentDetails,
+                    IfMatch = IfMatch,
+                    OpcRequestId = OpcRequestId,
+                    OpcRetryToken = OpcRetryToken
+                };
+
+                response = client.ChangeTemplateCompartment(request).GetAwaiter().GetResult();
+                WriteOutput(response);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private ChangeTemplateCompartmentResponse response;
+    }
+}
diff --git a/Resourcemanager/Cmdlets/New-OCIResourcemanagerTemplate.cs b/Resourcemanager/Cmdlets/New-OCIResourcemanagerTemplate.cs
new file mode 100644
index 000000000..6918aa21b
--- /dev/null
+++ b/Resourcemanager/Cmdlets/New-OCIResourcemanagerTemplate.cs
@@ -0,0 +1,66 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("New", "OCIResourcemanagerTemplate")]
+    [OutputType(new System.Type[] { typeof(Oci.ResourcemanagerService.Models.Template), typeof(Oci.ResourcemanagerService.Responses.CreateTemplateResponse) })]
+    public class NewOCIResourcemanagerTemplate : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The configuration details for creating a template.")]
+        public CreateTemplateDetails CreateTemplateDetails { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"A token that uniquely identifies a request so it can be retried in case of a timeout or server error without risk of retrying the same action. Retry tokens expire after 24 hours, but can be invalidated before then due to conflicting operations. For example, if a resource has been deleted and purged from the system, then a retry of the original creation request may be rejected.")]
+        public string OpcRetryToken { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"This is to enable limit/quota support through splat")]
+        public string OciSplatGeneratedOcids { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            CreateTemplateRequest request;
+
+            try
+            {
+                request = new CreateTemplateRequest
+                {
+                    CreateTemplateDetails = CreateTemplateDetails,
+                    OpcRequestId = OpcRequestId,
+                    OpcRetryToken = OpcRetryToken,
+                    OciSplatGeneratedOcids = OciSplatGeneratedOcids
+                };
+
+                response = client.CreateTemplate(request).GetAwaiter().GetResult();
+                WriteOutput(response, response.Template);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private CreateTemplateResponse response;
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Remove-OCIResourcemanagerTemplate.cs b/Resourcemanager/Cmdlets/Remove-OCIResourcemanagerTemplate.cs
new file mode 100644
index 000000000..b9330ace2
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Remove-OCIResourcemanagerTemplate.cs
@@ -0,0 +1,71 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Remove", "OCIResourcemanagerTemplate", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High)]
+    [OutputType(new System.Type[] { typeof(void), typeof(Oci.ResourcemanagerService.Responses.DeleteTemplateResponse) })]
+    public class RemoveOCIResourcemanagerTemplate : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the `PUT` or `DELETE` call for a resource, set the `if-match` parameter to the value of the etag from a previous `GET` or `POST` response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        public string IfMatch { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Ignore confirmation and force the Cmdlet to complete action.")]
+        public SwitchParameter Force { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+
+            if (!ConfirmDelete("OCIResourcemanagerTemplate", "Remove"))
+            {
+               return;
+            }
+
+            DeleteTemplateRequest request;
+
+            try
+            {
+                request = new DeleteTemplateRequest
+                {
+                    TemplateId = TemplateId,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                response = client.DeleteTemplate(request).GetAwaiter().GetResult();
+                WriteOutput(response);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private DeleteTemplateResponse response;
+    }
+}
diff --git a/Resourcemanager/Cmdlets/Update-OCIResourcemanagerTemplate.cs b/Resourcemanager/Cmdlets/Update-OCIResourcemanagerTemplate.cs
new file mode 100644
index 000000000..74f6f3de5
--- /dev/null
+++ b/Resourcemanager/Cmdlets/Update-OCIResourcemanagerTemplate.cs
@@ -0,0 +1,66 @@
+/*
+ * NOTE: Generated using OracleSDKGenerator, API Version: 20180917
+ * DO NOT EDIT this file manually.
+ *
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+ */
+
+using System;
+using System.Management.Automation;
+using Oci.ResourcemanagerService.Requests;
+using Oci.ResourcemanagerService.Responses;
+using Oci.ResourcemanagerService.Models;
+
+namespace Oci.ResourcemanagerService.Cmdlets
+{
+    [Cmdlet("Update", "OCIResourcemanagerTemplate")]
+    [OutputType(new System.Type[] { typeof(Oci.ResourcemanagerService.Models.Template), typeof(Oci.ResourcemanagerService.Responses.UpdateTemplateResponse) })]
+    public class UpdateOCIResourcemanagerTemplate : OCIResourceManagerCmdlet
+    {
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the template.")]
+        public string TemplateId { get; set; }
+
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = @"The details for updating a template.")]
+        public UpdateTemplateDetails UpdateTemplateDetails { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID.")]
+        public string OpcRequestId { get; set; }
+
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = @"For optimistic concurrency control. In the `PUT` or `DELETE` call for a resource, set the `if-match` parameter to the value of the etag from a previous `GET` or `POST` response for that resource.  The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.")]
+        public string IfMatch { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            base.ProcessRecord();
+            UpdateTemplateRequest request;
+
+            try
+            {
+                request = new UpdateTemplateRequest
+                {
+                    TemplateId = TemplateId,
+                    UpdateTemplateDetails = UpdateTemplateDetails,
+                    OpcRequestId = OpcRequestId,
+                    IfMatch = IfMatch
+                };
+
+                response = client.UpdateTemplate(request).GetAwaiter().GetResult();
+                WriteOutput(response, response.Template);
+                FinishProcessing(response);
+            }
+            catch (Exception ex)
+            {
+                TerminatingErrorDuringExecution(ex);
+            }
+        }
+
+        protected override void StopProcessing()
+        {
+            base.StopProcessing();
+            TerminatingErrorDuringExecution(new OperationCanceledException("Cmdlet execution interrupted"));
+        }
+
+        private UpdateTemplateResponse response;
+    }
+}
diff --git a/Resourcemanager/OCI.PSModules.Resourcemanager.psd1 b/Resourcemanager/OCI.PSModules.Resourcemanager.psd1
index 44e76456b..c323c4bc2 100644
--- a/Resourcemanager/OCI.PSModules.Resourcemanager.psd1
+++ b/Resourcemanager/OCI.PSModules.Resourcemanager.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Resourcemanager.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Resourcemanager.dll'
@@ -85,6 +85,11 @@ CmdletsToExport = 'Get-OCIResourcemanagerConfigurationSourceProvider',
                'Get-OCIResourcemanagerStacksList', 
                'Get-OCIResourcemanagerStackTfConfig', 
                'Get-OCIResourcemanagerStackTfState', 
+               'Get-OCIResourcemanagerTemplate', 
+               'Get-OCIResourcemanagerTemplateCategoriesList', 
+               'Get-OCIResourcemanagerTemplateLogo', 
+               'Get-OCIResourcemanagerTemplatesList', 
+               'Get-OCIResourcemanagerTemplateTfConfig', 
                'Get-OCIResourcemanagerTerraformVersionsList', 
                'Get-OCIResourcemanagerWorkRequest', 
                'Get-OCIResourcemanagerWorkRequestErrorsList', 
@@ -93,12 +98,16 @@ CmdletsToExport = 'Get-OCIResourcemanagerConfigurationSourceProvider',
                'Invoke-OCIResourcemanagerDetectStackDrift', 
                'Move-OCIResourcemanagerConfigurationSourceProviderCompartment', 
                'Move-OCIResourcemanagerStackCompartment', 
+               'Move-OCIResourcemanagerTemplateCompartment', 
                'New-OCIResourcemanagerConfigurationSourceProvider', 
                'New-OCIResourcemanagerJob', 'New-OCIResourcemanagerStack', 
+               'New-OCIResourcemanagerTemplate', 
                'Remove-OCIResourcemanagerConfigurationSourceProvider', 
-               'Remove-OCIResourcemanagerStack', 'Stop-OCIResourcemanagerJob', 
+               'Remove-OCIResourcemanagerStack', 
+               'Remove-OCIResourcemanagerTemplate', 'Stop-OCIResourcemanagerJob', 
                'Update-OCIResourcemanagerConfigurationSourceProvider', 
-               'Update-OCIResourcemanagerJob', 'Update-OCIResourcemanagerStack'
+               'Update-OCIResourcemanagerJob', 'Update-OCIResourcemanagerStack', 
+               'Update-OCIResourcemanagerTemplate'
 
 # Variables to export from this module
 VariablesToExport = '*'
diff --git a/Resourcesearch/OCI.PSModules.Resourcesearch.psd1 b/Resourcesearch/OCI.PSModules.Resourcesearch.psd1
index 58205d52c..b26eef386 100644
--- a/Resourcesearch/OCI.PSModules.Resourcesearch.psd1
+++ b/Resourcesearch/OCI.PSModules.Resourcesearch.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Resourcesearch.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Resourcesearch.dll'
diff --git a/Rover/OCI.PSModules.Rover.psd1 b/Rover/OCI.PSModules.Rover.psd1
index 505d297c5..b11703c2b 100644
--- a/Rover/OCI.PSModules.Rover.psd1
+++ b/Rover/OCI.PSModules.Rover.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Rover.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Rover.dll'
diff --git a/Sch/OCI.PSModules.Sch.psd1 b/Sch/OCI.PSModules.Sch.psd1
index 928995c33..463254e51 100644
--- a/Sch/OCI.PSModules.Sch.psd1
+++ b/Sch/OCI.PSModules.Sch.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Sch.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Sch.dll'
diff --git a/Secrets/OCI.PSModules.Secrets.psd1 b/Secrets/OCI.PSModules.Secrets.psd1
index db1b55b3d..38491c938 100644
--- a/Secrets/OCI.PSModules.Secrets.psd1
+++ b/Secrets/OCI.PSModules.Secrets.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Secrets.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Secrets.dll'
diff --git a/Streaming/OCI.PSModules.Streaming.psd1 b/Streaming/OCI.PSModules.Streaming.psd1
index 0f51e0601..e649e82f2 100644
--- a/Streaming/OCI.PSModules.Streaming.psd1
+++ b/Streaming/OCI.PSModules.Streaming.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Streaming.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Streaming.dll'
diff --git a/Tenantmanagercontrolplane/OCI.PSModules.Tenantmanagercontrolplane.psd1 b/Tenantmanagercontrolplane/OCI.PSModules.Tenantmanagercontrolplane.psd1
index f7c4cc53b..0ad6e788b 100644
--- a/Tenantmanagercontrolplane/OCI.PSModules.Tenantmanagercontrolplane.psd1
+++ b/Tenantmanagercontrolplane/OCI.PSModules.Tenantmanagercontrolplane.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Tenantmanagercontrolplane.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Tenantmanagercontrolplane.dll'
diff --git a/Usageapi/OCI.PSModules.Usageapi.psd1 b/Usageapi/OCI.PSModules.Usageapi.psd1
index 2fa660909..7038dfde8 100644
--- a/Usageapi/OCI.PSModules.Usageapi.psd1
+++ b/Usageapi/OCI.PSModules.Usageapi.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Usageapi.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Usageapi.dll'
diff --git a/Vault/OCI.PSModules.Vault.psd1 b/Vault/OCI.PSModules.Vault.psd1
index f94df3297..db214d859 100644
--- a/Vault/OCI.PSModules.Vault.psd1
+++ b/Vault/OCI.PSModules.Vault.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Vault.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Vault.dll'
diff --git a/Waas/OCI.PSModules.Waas.psd1 b/Waas/OCI.PSModules.Waas.psd1
index 1544102ac..0ce1651a1 100644
--- a/Waas/OCI.PSModules.Waas.psd1
+++ b/Waas/OCI.PSModules.Waas.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Waas.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Waas.dll'
diff --git a/Workrequests/OCI.PSModules.Workrequests.psd1 b/Workrequests/OCI.PSModules.Workrequests.psd1
index e0d6218a1..678fd9a84 100644
--- a/Workrequests/OCI.PSModules.Workrequests.psd1
+++ b/Workrequests/OCI.PSModules.Workrequests.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Oracle Cloud Infrastructure
 #
-# Generated on: 1/25/2021
+# Generated on: 2/1/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'assemblies/OCI.PSModules.Workrequests.dll'
 
 # Version number of this module.
-ModuleVersion = '7.0.0'
+ModuleVersion = '8.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
@@ -51,7 +51,7 @@ PowerShellVersion = '6.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '7.0.0'; })
+RequiredModules = @(@{ModuleName = 'OCI.PSModules.Common'; GUID = 'b3061a0d-375b-4099-ae76-f92fb3cdcdae'; RequiredVersion = '8.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'assemblies/OCI.DotNetSDK.Workrequests.dll'