diff --git a/src/PSAppDeployToolkit.Tools/PSScriptAnalyzer/Measure-ADTCompatibility.psm1 b/src/PSAppDeployToolkit.Tools/PSScriptAnalyzer/Measure-ADTCompatibility.psm1
index f62a094..15e44c8 100644
--- a/src/PSAppDeployToolkit.Tools/PSScriptAnalyzer/Measure-ADTCompatibility.psm1
+++ b/src/PSAppDeployToolkit.Tools/PSScriptAnalyzer/Measure-ADTCompatibility.psm1
@@ -85,76 +85,76 @@ function Measure-ADTCompatibility
             ButtonRightText = $null
             CleanupBlockedApps = $null
             closeAppsCountdownGlobal = $null
-            configBalloonTextComplete = $null
-            configBalloonTextError = $null
-            configBalloonTextFastRetry = $null
-            configBalloonTextRestartRequired = $null
-            configBalloonTextStart = $null
-            configBannerIconBannerName = $null
+            configBalloonTextComplete = '(Get-ADTStringTable).BalloonText.Complete'
+            configBalloonTextError = '(Get-ADTStringTable).BalloonText.Error'
+            configBalloonTextFastRetry = '(Get-ADTStringTable).BalloonText.FastRetry'
+            configBalloonTextRestartRequired = '(Get-ADTStringTable).BalloonText.RestartRequired'
+            configBalloonTextStart = '(Get-ADTStringTable).BalloonText.Start'
+            configBannerIconBannerName = '(Get-ADTConfig).Assets.Banner'
             configBannerIconFileName = $null
-            configBannerLogoImageFileName = $null
-            configBlockExecutionMessage = $null
-            configClosePromptButtonClose = $null
-            configClosePromptButtonContinue = $null
-            configClosePromptButtonContinueTooltip = $null
-            configClosePromptButtonDefer = $null
-            configClosePromptCountdownMessage = $null
-            configClosePromptMessage = $null
+            configBannerLogoImageFileName = '(Get-ADTConfig).Assets.Logo'
+            configBlockExecutionMessage = '(Get-ADTStringTable).BlockExecution.Message'
+            configClosePromptButtonClose = '(Get-ADTStringTable).ClosePrompt.ButtonClose'
+            configClosePromptButtonContinue = '(Get-ADTStringTable).ClosePrompt.ButtonContinue'
+            configClosePromptButtonContinueTooltip = '(Get-ADTStringTable).ClosePrompt.ButtonContinueTooltip'
+            configClosePromptButtonDefer = '(Get-ADTStringTable).ClosePrompt.ButtonDefer'
+            configClosePromptCountdownMessage = '(Get-ADTStringTable).ClosePrompt.CountdownMessage'
+            configClosePromptMessage = '(Get-ADTStringTable).ClosePrompt.Message'
             configConfigDate = $null
             configConfigDetails = $null
             configConfigVersion = $null
-            configDeferPromptDeadline = $null
-            configDeferPromptExpiryMessage = $null
-            configDeferPromptRemainingDeferrals = $null
-            configDeferPromptWarningMessage = $null
-            configDeferPromptWelcomeMessage = $null
-            configDeploymentTypeInstall = $null
-            configDeploymentTypeRepair = $null
-            configDeploymentTypeUnInstall = $null
-            configDiskSpaceMessage = $null
-            configInstallationDeferExitCode = $null
-            configInstallationPersistInterval = $null
-            configInstallationPromptToSave = $null
-            configInstallationRestartPersistInterval = $null
-            configInstallationUIExitCode = $null
-            configInstallationUILanguageOverride = $null
-            configInstallationUITimeout = $null
-            configInstallationWelcomePromptDynamicRunningProcessEvaluation = $null
-            configInstallationWelcomePromptDynamicRunningProcessEvaluationInterval = $null
-            configMSIInstallParams = $null
-            configMSILogDir = $null
-            configMSILoggingOptions = $null
-            configMSIMutexWaitTime = $null
-            configMSISilentParams = $null
-            configMSIUninstallParams = $null
-            configProgressMessageInstall = $null
-            configProgressMessageRepair = $null
-            configProgressMessageUninstall = $null
-            configRestartPromptButtonRestartLater = $null
-            configRestartPromptButtonRestartNow = $null
-            configRestartPromptMessage = $null
-            configRestartPromptMessageRestart = $null
-            configRestartPromptMessageTime = $null
-            configRestartPromptTimeRemaining = $null
-            configRestartPromptTitle = $null
-            configShowBalloonNotifications = $null
-            configToastAppName = $null
-            configToastDisable = $null
-            configToolkitCachePath = $null
-            configToolkitCompressLogs = $null
-            configToolkitLogAppend = $null
-            configToolkitLogDebugMessage = $null
-            configToolkitLogDir = $null
-            configToolkitLogMaxHistory = $null
-            configToolkitLogMaxSize = $null
-            configToolkitLogStyle = $null
-            configToolkitLogWriteToHost = $null
-            configToolkitRegPath = $null
-            configToolkitRequireAdmin = $null
-            configToolkitTempPath = $null
-            configToolkitUseRobocopy = $null
-            configWelcomePromptCountdownMessage = $null
-            configWelcomePromptCustomMessage = $null
+            configDeferPromptDeadline = '(Get-ADTStringTable).DeferPrompt.Deadline'
+            configDeferPromptExpiryMessage = '(Get-ADTStringTable).DeferPrompt.ExpiryMessage'
+            configDeferPromptRemainingDeferrals = '(Get-ADTStringTable).DeferPrompt.RemainingDeferrals'
+            configDeferPromptWarningMessage = '(Get-ADTStringTable).DeferPrompt.WarningMessage'
+            configDeferPromptWelcomeMessage = '(Get-ADTStringTable).DeferPrompt.WelcomeMessage'
+            configDeploymentTypeInstall = '(Get-ADTStringTable).DeploymentType.Install'
+            configDeploymentTypeRepair = '(Get-ADTStringTable).DeploymentType.Repair'
+            configDeploymentTypeUnInstall = '(Get-ADTStringTable).DeploymentType.Uninstall'
+            configDiskSpaceMessage = '(Get-ADTStringTable).DiskSpace.Message'
+            configInstallationDeferExitCode = '(Get-ADTConfig).UI.DeferExitCode'
+            configInstallationPersistInterval = '(Get-ADTConfig).UI.DefaultPromptPersistInterval'
+            configInstallationPromptToSave = '(Get-ADTConfig).UI.PromptToSaveTimeout'
+            configInstallationRestartPersistInterval = '(Get-ADTConfig).UI.RestartPromptPersistInterval'
+            configInstallationUIExitCode = '(Get-ADTConfig).UI.DefaultExitCode'
+            configInstallationUILanguageOverride = '(Get-ADTConfig).UI.LanguageOverride'
+            configInstallationUITimeout = '(Get-ADTConfig).UI.DefaultTimeout'
+            configInstallationWelcomePromptDynamicRunningProcessEvaluation = '(Get-ADTConfig).UI.DynamicProcessEvaluation'
+            configInstallationWelcomePromptDynamicRunningProcessEvaluationInterval = '(Get-ADTConfig).UI.DynamicProcessEvaluationInterval'
+            configMSIInstallParams = '(Get-ADTConfig).MSI.InstallParams'
+            configMSILogDir = 'if ($isAdmin) { (Get-ADTConfig).MSI.LogPath } else { (Get-ADTConfig).MSI.LogPathNoAdminRights }'
+            configMSILoggingOptions = '(Get-ADTConfig).MSI.LoggingOptions'
+            configMSIMutexWaitTime = '(Get-ADTConfig).MSI.MutexWaitTime'
+            configMSISilentParams = '(Get-ADTConfig).MSI.SilentParams'
+            configMSIUninstallParams = '(Get-ADTConfig).MSI.UninstallParams'
+            configProgressMessageInstall = '(Get-ADTStringTable).Progress.MessageInstall'
+            configProgressMessageRepair = '(Get-ADTStringTable).Progress.MessageRepair'
+            configProgressMessageUninstall = '(Get-ADTStringTable).Progress.MessageUninstall'
+            configRestartPromptButtonRestartLater = '(Get-ADTStringTable).RestartPrompt.ButtonRestartLater'
+            configRestartPromptButtonRestartNow = '(Get-ADTStringTable).RestartPrompt.ButtonRestartNow'
+            configRestartPromptMessage = '(Get-ADTStringTable).RestartPrompt.Message'
+            configRestartPromptMessageRestart = '(Get-ADTStringTable).RestartPrompt.MessageRestart'
+            configRestartPromptMessageTime = '(Get-ADTStringTable).RestartPrompt.MessageTime'
+            configRestartPromptTimeRemaining = '(Get-ADTStringTable).RestartPrompt.TimeRemaining'
+            configRestartPromptTitle = '(Get-ADTStringTable).RestartPrompt.Title'
+            configShowBalloonNotifications = '(Get-ADTConfig).UI.BalloonNotifications'
+            configToastAppName = '(Get-ADTConfig).UI.BalloonTitle'
+            configToastDisable = '(Get-ADTConfig).UI.BalloonNotifications'
+            configToolkitCachePath = '(Get-ADTConfig).Toolkit.CachePath'
+            configToolkitCompressLogs = '(Get-ADTConfig).Toolkit.CompressLogs'
+            configToolkitLogAppend = '(Get-ADTConfig).Toolkit.LogAppend'
+            configToolkitLogDebugMessage = '(Get-ADTConfig).Toolkit.LogDebugMessage'
+            configToolkitLogDir = 'if ($isAdmin) { (Get-ADTConfig).Toolkit.LogPath } else { (Get-ADTConfig).Toolkit.LogPathNoAdminRights }'
+            configToolkitLogMaxHistory = '(Get-ADTConfig).Toolkit.LogMaxHistory'
+            configToolkitLogMaxSize = '(Get-ADTConfig).Toolkit.LogMaxSize'
+            configToolkitLogStyle = '(Get-ADTConfig).Toolkit.LogStyle'
+            configToolkitLogWriteToHost = '(Get-ADTConfig).Toolkit.LogWriteToHost'
+            configToolkitRegPath = '(Get-ADTConfig).Toolkit.RegPath'
+            configToolkitRequireAdmin = '(Get-ADTConfig).Toolkit.RequireAdmin'
+            configToolkitTempPath = 'if ($isAdmin) { (Get-ADTConfig).Toolkit.TempPath } else { (Get-ADTConfig).Toolkit.TempPathNoAdminRights }'
+            configToolkitUseRobocopy = '(Get-ADTConfig).Toolkit.FileCopyMode -eq ''Robocopy'''
+            configWelcomePromptCountdownMessage = '(Get-ADTStringTable).WelcomePrompt.Classic.CountdownMessage'
+            configWelcomePromptCustomMessage = '(Get-ADTStringTable).WelcomePrompt.Classic.CustomMessage'
             CountdownNoHideSeconds = $null
             CountdownSeconds = $null
             currentTime = $null
@@ -186,7 +186,7 @@ function Measure-ADTCompatibility
             installationStarted = $null
             InvocationInfo = $null
             invokingScript = $null
-            IsOOBEComplete = '(Test-ADTOobeCompleted)'
+            IsOOBEComplete = 'Test-ADTOobeCompleted'
             IsTaskSchedulerHealthy = $null
             LocalPowerUsersGroup = $null
             LogFileInitialized = $null
@@ -194,7 +194,6 @@ function Measure-ADTCompatibility
             LogicalScreenHeight = $null
             LogTimeZoneBias = $null
             mainExitCode = $null
-            Matches = $null
             Message = $null
             MessageAlignment = $null
             MinimizeWindows = $null