diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1
index aec6e79b42..413dc6b7b7 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1
@@ -120,7 +120,7 @@ function Get-TargetResource
 
         if ($null -eq $getValue -and -not [string]::IsNullOrEmpty($DisplayName))
         {
-            Write-Verbose -Message "Could not find an Azure AD Administrative Unit with Id {$Id}"
+            Write-Verbose -Message "Could not find an Azure AD Administrative Unit by Id, trying by DisplayName {$DisplayName}"
             if (-Not [string]::IsNullOrEmpty($DisplayName))
             {
                 if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.schema.mof
index cffeaae1e1..5d4a38b79d 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.schema.mof
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.schema.mof
@@ -5,7 +5,7 @@ class MSFT_AADAuthenticationFlowPolicy : OMI_BaseResource
     [Write, Description("Unique identifier of the Authentication Flow Policy.")] String Id;
     [Write, Description("Display name of the Authentication Flow Policy.")] String DisplayName;
     [Write, Description("Description of the Authentication Flow Policy.")] String Description;
-    [Write, Description("Indicates whether self-service sign-up flow is enabled or disabled. The default value is false. This property isn't a key. Required.")] String SelfServiceSignUpEnabled;
+    [Write, Description("Indicates whether self-service sign-up flow is enabled or disabled. The default value is false. This property isn't a key. Required.")] Boolean SelfServiceSignUpEnabled;
     [Write, Description("Credentials of the Azure Active Directory Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;
     [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId;
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1
index 5b570d0d55..90a27ef215 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1
@@ -717,7 +717,6 @@ function Export-TargetResource
             [array]$resources = Get-MgBetaEntitlementManagementAccessPackageCatalogAccessPackageResource -AccessPackageCatalogId  $catalogId -ErrorAction Stop
 
             $j = 1
-            $dscContent = ''
 
             if ($resources.Length -eq 0)
             {
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1
index c0c53860d8..b2ecd0d7e8 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1
@@ -24,18 +24,16 @@ Configuration Example
     {
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
-            DisplayName         = 'Human Resources'
-            CatalogId           = 'My Catalog'
-            Description         = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            IsPendingOnboarding = $true
-            OriginId            = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            OriginSystem        = 'SharePointOnline'
-            ResourceType        = 'SharePoint Online Site'
-            Url                 = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            Ensure              = 'Present'
-            ApplicationId         = $ApplicationId
-            TenantId              = $TenantId
-            CertificateThumbprint = $CertificateThumbprint
+            ApplicationId         = $ApplicationId;
+            CatalogId             = "My Catalog";
+            CertificateThumbprint = $CertificateThumbprint;
+            DisplayName           = "Integration Package Resource";
+            OriginSystem          = "AADGroup";
+            OriginId              = '849b3661-61a8-44a8-92e7-fcc91d296235'
+            Ensure                = "Present";
+            IsPendingOnboarding   = $True;
+            TenantId              = $TenantId;
+            Url                   = "https://myapps.microsoft.com/$TenantId/signin/$ApplicationId/";
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1
index c91456105f..868cdfdd31 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1
@@ -24,18 +24,16 @@ Configuration Example
     {
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
-            DisplayName         = 'Human Resources'
-            CatalogId           = 'My Catalog'
-            Description         = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            IsPendingOnboarding = $false # Updated Property
-            OriginId            = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            OriginSystem        = 'SharePointOnline'
-            ResourceType        = 'SharePoint Online Site'
-            Url                 = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
-            Ensure              = 'Present'
-            ApplicationId         = $ApplicationId
-            TenantId              = $TenantId
-            CertificateThumbprint = $CertificateThumbprint
+            ApplicationId         = $ApplicationId;
+            CatalogId             = "My Catalog";
+            CertificateThumbprint = $CertificateThumbprint;
+            DisplayName           = "Integration Package Resource";
+            OriginSystem          = "AADGroup";
+            OriginId              = '849b3661-61a8-44a8-92e7-fcc91d296235'
+            Ensure                = "Present";
+            IsPendingOnboarding   = $False;
+            TenantId              = $TenantId;
+            Url                   = "https://myapps.microsoft.com/$TenantId/signin/$ApplicationId/";
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1
index a6948ba719..fc582fc96e 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1
@@ -24,7 +24,7 @@ Configuration Example
     {
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
-            DisplayName         = 'Communication site'
+            DisplayName         = 'Integration Package Resource'
             Ensure              = 'Absent'
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId