From a04dcaa2d277bb64c44b0752e94498316b453a3b Mon Sep 17 00:00:00 2001
From: Nate Ferrell <nate@scrthq.com>
Date: Tue, 28 Aug 2018 15:15:10 -0500
Subject: [PATCH] !build v2.4.1 with fix for #35

---
 CHANGELOG.md                                  |  56 ++++----
 VaporShell/Private/Convert-SpecToFunction.ps1 |   2 +-
 .../Add-VSAmazonMQBrokerConfigurationId.ps1   |   4 +-
 .../Add-VSAmazonMQBrokerLogList.ps1           |  54 ++++++++
 .../Add-VSAmazonMQBrokerMaintenanceWindow.ps1 |   8 +-
 .../Add-VSAmazonMQBrokerUser.ps1              |   6 +-
 .../Add-VSApiGatewayApiKeyStageKey.ps1        |   6 +-
 ...dd-VSApiGatewayDeploymentMethodSetting.ps1 |   8 +-
 ...VSApiGatewayDeploymentStageDescription.ps1 |  12 +-
 ...-VSApiGatewayDocumentationPartLocation.ps1 |  12 +-
 ...GatewayDomainNameEndpointConfiguration.ps1 |   2 +-
 .../Add-VSApiGatewayMethodIntegration.ps1     |  16 +--
 ...-VSApiGatewayMethodIntegrationResponse.ps1 |   8 +-
 .../Add-VSApiGatewayMethodMethodResponse.ps1  |   4 +-
 ...ApiGatewayRestApiEndpointConfiguration.ps1 |   2 +-
 .../Add-VSApiGatewayRestApiS3Location.ps1     |  10 +-
 .../Add-VSApiGatewayStageMethodSetting.ps1    |   8 +-
 .../Add-VSApiGatewayUsagePlanApiStage.ps1     |   6 +-
 ...Add-VSApiGatewayUsagePlanQuotaSettings.ps1 |   4 +-
 ...-VSApiGatewayUsagePlanThrottleSettings.ps1 |   2 +-
 .../Add-VSAppSyncDataSourceDynamoDBConfig.ps1 |   6 +-
 ...VSAppSyncDataSourceElasticsearchConfig.ps1 |   6 +-
 .../Add-VSAppSyncDataSourceHttpConfig.ps1     |   4 +-
 .../Add-VSAppSyncDataSourceLambdaConfig.ps1   |   4 +-
 .../Add-VSAppSyncGraphQLApiLogConfig.ps1      |   6 +-
 ...VSAppSyncGraphQLApiOpenIDConnectConfig.ps1 |   6 +-
 .../Add-VSAppSyncGraphQLApiUserPoolConfig.ps1 |  10 +-
 ...lingScalableTargetScalableTargetAction.ps1 |   2 +-
 ...toScalingScalableTargetScheduledAction.ps1 |   6 +-
 ...ingPolicyCustomizedMetricSpecification.ps1 |  10 +-
 ...utoScalingScalingPolicyMetricDimension.ps1 |   6 +-
 ...ingPolicyPredefinedMetricSpecification.ps1 |   6 +-
 ...AutoScalingScalingPolicyStepAdjustment.ps1 |   2 +-
 ...ngPolicyStepScalingPolicyConfiguration.ps1 |   6 +-
 ...rgetTrackingScalingPolicyConfiguration.ps1 |   2 +-
 ...ScalingGroupLifecycleHookSpecification.ps1 |  14 +-
 ...alingAutoScalingGroupMetricsCollection.ps1 |   4 +-
 ...oScalingGroupNotificationConfiguration.ps1 |   4 +-
 ...AutoScalingAutoScalingGroupTagProperty.ps1 |   6 +-
 ...oScalingLaunchConfigurationBlockDevice.ps1 |   6 +-
 ...gLaunchConfigurationBlockDeviceMapping.ps1 |   6 +-
 ...alingPlansScalingPlanApplicationSource.ps1 |   4 +-
 ...anCustomizedScalingMetricSpecification.ps1 |  10 +-
 ...ScalingPlansScalingPlanMetricDimension.ps1 |   6 +-
 ...anPredefinedScalingMetricSpecification.ps1 |   6 +-
 ...lingPlansScalingPlanScalingInstruction.ps1 |   8 +-
 ...VSAutoScalingPlansScalingPlanTagFilter.ps1 |   4 +-
 ...ScalingPlanTargetTrackingConfiguration.ps1 |   2 +-
 ...ingPolicyCustomizedMetricSpecification.ps1 |  10 +-
 ...utoScalingScalingPolicyMetricDimension.ps1 |   6 +-
 ...ingPolicyPredefinedMetricSpecification.ps1 |   6 +-
 ...AutoScalingScalingPolicyStepAdjustment.ps1 |   2 +-
 ...alingPolicyTargetTrackingConfiguration.ps1 |   2 +-
 ...atchComputeEnvironmentComputeResources.ps1 |  12 +-
 ...SBatchJobDefinitionContainerProperties.ps1 |   8 +-
 .../Add-VSBatchJobDefinitionEnvironment.ps1   |   6 +-
 .../Add-VSBatchJobDefinitionMountPoints.ps1   |   6 +-
 .../Add-VSBatchJobDefinitionRetryStrategy.ps1 |   2 +-
 .../Add-VSBatchJobDefinitionTimeout.ps1       |   2 +-
 .../Add-VSBatchJobDefinitionUlimit.ps1        |   4 +-
 .../Add-VSBatchJobDefinitionVolumes.ps1       |   4 +-
 .../Add-VSBatchJobDefinitionVolumesHost.ps1   |   4 +-
 ...VSBatchJobQueueComputeEnvironmentOrder.ps1 |   4 +-
 .../Add-VSBudgetsBudgetBudgetData.ps1         |   8 +-
 .../Add-VSBudgetsBudgetCostTypes.ps1          |   2 +-
 .../Add-VSBudgetsBudgetNotification.ps1       |   8 +-
 ...dgetsBudgetNotificationWithSubscribers.ps1 |   2 +-
 .../Add-VSBudgetsBudgetSpend.ps1              |   4 +-
 .../Add-VSBudgetsBudgetSubscriber.ps1         |   6 +-
 .../Add-VSBudgetsBudgetTimePeriod.ps1         |   6 +-
 ...nagerCertificateDomainValidationOption.ps1 |   6 +-
 .../Add-VSCloud9EnvironmentEC2Repository.ps1  |   6 +-
 ...tyCloudFrontOriginAccessIdentityConfig.ps1 |   4 +-
 ...-VSCloudFrontDistributionCacheBehavior.ps1 |  10 +-
 .../Add-VSCloudFrontDistributionCookies.ps1   |   4 +-
 ...udFrontDistributionCustomErrorResponse.ps1 |   4 +-
 ...oudFrontDistributionCustomOriginConfig.ps1 |   4 +-
 ...dFrontDistributionDefaultCacheBehavior.ps1 |   8 +-
 ...oudFrontDistributionDistributionConfig.ps1 |  12 +-
 ...SCloudFrontDistributionForwardedValues.ps1 |   2 +-
 ...VSCloudFrontDistributionGeoRestriction.ps1 |   4 +-
 ...tDistributionLambdaFunctionAssociation.ps1 |   6 +-
 .../Add-VSCloudFrontDistributionLogging.ps1   |   6 +-
 .../Add-VSCloudFrontDistributionOrigin.ps1    |   8 +-
 ...oudFrontDistributionOriginCustomHeader.ps1 |   6 +-
 ...d-VSCloudFrontDistributionRestrictions.ps1 |   2 +-
 ...VSCloudFrontDistributionS3OriginConfig.ps1 |   4 +-
 ...loudFrontDistributionViewerCertificate.ps1 |  10 +-
 ...CloudFrontStreamingDistributionLogging.ps1 |   6 +-
 ...loudFrontStreamingDistributionS3Origin.ps1 |   6 +-
 ...istributionStreamingDistributionConfig.ps1 |   6 +-
 ...ontStreamingDistributionTrustedSigners.ps1 |   2 +-
 .../Add-VSCloudTrailTrailDataResource.ps1     |   4 +-
 .../Add-VSCloudTrailTrailEventSelector.ps1    |   4 +-
 .../Add-VSCloudWatchAlarmDimension.ps1        |   6 +-
 .../Add-VSCodeBuildProjectArtifacts.ps1       |  14 +-
 .../Add-VSCodeBuildProjectEnvironment.ps1     |  10 +-
 ...-VSCodeBuildProjectEnvironmentVariable.ps1 |   8 +-
 .../Add-VSCodeBuildProjectProjectCache.ps1    |   6 +-
 .../Add-VSCodeBuildProjectProjectTriggers.ps1 |   2 +-
 .../Add-VSCodeBuildProjectSource.ps1          |   8 +-
 .../Add-VSCodeBuildProjectSourceAuth.ps1      |   6 +-
 .../Add-VSCodeBuildProjectVpcConfig.ps1       |   4 +-
 ...SCodeCommitRepositoryRepositoryTrigger.ps1 |   8 +-
 ...loyDeploymentConfigMinimumHealthyHosts.ps1 |   4 +-
 .../Add-VSCodeDeployDeploymentGroupAlarm.ps1  |   4 +-
 ...eployDeploymentGroupAlarmConfiguration.ps1 |   2 +-
 ...ploymentGroupAutoRollbackConfiguration.ps1 |   2 +-
 ...-VSCodeDeployDeploymentGroupDeployment.ps1 |   4 +-
 ...deDeployDeploymentGroupDeploymentStyle.ps1 |   6 +-
 ...SCodeDeployDeploymentGroupEC2TagFilter.ps1 |   8 +-
 ...Add-VSCodeDeployDeploymentGroupELBInfo.ps1 |   4 +-
 ...odeDeployDeploymentGroupGitHubLocation.ps1 |   6 +-
 ...eDeployDeploymentGroupLoadBalancerInfo.ps1 |   2 +-
 ...eDeployDeploymentGroupRevisionLocation.ps1 |   4 +-
 ...-VSCodeDeployDeploymentGroupS3Location.ps1 |  12 +-
 ...d-VSCodeDeployDeploymentGroupTagFilter.ps1 |   8 +-
 ...deDeployDeploymentGroupTargetGroupInfo.ps1 |   4 +-
 ...CodeDeployDeploymentGroupTriggerConfig.ps1 |   6 +-
 ...ipelineCustomActionTypeArtifactDetails.ps1 |   2 +-
 ...ustomActionTypeConfigurationProperties.ps1 |   8 +-
 ...VSCodePipelineCustomActionTypeSettings.ps1 |  10 +-
 ...SCodePipelinePipelineActionDeclaration.ps1 |   6 +-
 ...Add-VSCodePipelinePipelineActionTypeId.ps1 |  10 +-
 ...dd-VSCodePipelinePipelineArtifactStore.ps1 |   6 +-
 ...CodePipelinePipelineBlockerDeclaration.ps1 |   6 +-
 ...dd-VSCodePipelinePipelineEncryptionKey.ps1 |   6 +-
 ...dd-VSCodePipelinePipelineInputArtifact.ps1 |   4 +-
 ...d-VSCodePipelinePipelineOutputArtifact.ps1 |   4 +-
 ...VSCodePipelinePipelineStageDeclaration.ps1 |   4 +-
 ...-VSCodePipelinePipelineStageTransition.ps1 |   6 +-
 ...ipelineWebhookWebhookAuthConfiguration.ps1 |   6 +-
 ...VSCodePipelineWebhookWebhookFilterRule.ps1 |   6 +-
 ...itoIdentityPoolCognitoIdentityProvider.ps1 |   6 +-
 ...dd-VSCognitoIdentityPoolCognitoStreams.ps1 |   8 +-
 .../Add-VSCognitoIdentityPoolPushSync.ps1     |   4 +-
 ...oIdentityPoolRoleAttachmentMappingRule.ps1 |  10 +-
 ...oIdentityPoolRoleAttachmentRoleMapping.ps1 |   6 +-
 ...olRoleAttachmentRulesConfigurationType.ps1 |   2 +-
 ...VSCognitoUserPoolAdminCreateUserConfig.ps1 |   2 +-
 ...d-VSCognitoUserPoolDeviceConfiguration.ps1 |   2 +-
 ...dd-VSCognitoUserPoolEmailConfiguration.ps1 |   6 +-
 ...VSCognitoUserPoolInviteMessageTemplate.ps1 |   8 +-
 .../Add-VSCognitoUserPoolLambdaConfig.ps1     |  18 +--
 ...nitoUserPoolNumberAttributeConstraints.ps1 |   6 +-
 .../Add-VSCognitoUserPoolPasswordPolicy.ps1   |   2 +-
 .../Add-VSCognitoUserPoolPolicies.ps1         |   2 +-
 .../Add-VSCognitoUserPoolSchemaAttribute.ps1  |   6 +-
 .../Add-VSCognitoUserPoolSmsConfiguration.ps1 |   6 +-
 ...nitoUserPoolStringAttributeConstraints.ps1 |   6 +-
 ...Add-VSCognitoUserPoolUserAttributeType.ps1 |   6 +-
 .../Add-VSConfigConfigRuleScope.ps1           |   8 +-
 .../Add-VSConfigConfigRuleSource.ps1          |   6 +-
 .../Add-VSConfigConfigRuleSourceDetail.ps1    |   8 +-
 ...tionAggregatorAccountAggregationSource.ps1 |   2 +-
 ...ggregatorOrganizationAggregationSource.ps1 |   4 +-
 ...figConfigurationRecorderRecordingGroup.ps1 |   2 +-
 ...hannelConfigSnapshotDeliveryProperties.ps1 |   4 +-
 .../Add-VSDAXClusterSSESpecification.ps1      |  45 +++++++
 .../Add-VSDMSEndpointDynamoDbSettings.ps1     |   4 +-
 .../Add-VSDMSEndpointMongoDbSettings.ps1      |  22 +--
 .../Add-VSDMSEndpointS3Settings.ps1           |  16 +--
 .../Add-VSDataPipelinePipelineField.ps1       |   8 +-
 ...DataPipelinePipelineParameterAttribute.ps1 |   6 +-
 ...-VSDataPipelinePipelineParameterObject.ps1 |   4 +-
 ...d-VSDataPipelinePipelineParameterValue.ps1 |   6 +-
 ...d-VSDataPipelinePipelinePipelineObject.ps1 |   6 +-
 .../Add-VSDataPipelinePipelinePipelineTag.ps1 |   6 +-
 ...DirectoryServiceMicrosoftADVpcSettings.ps1 |   4 +-
 ...-VSDirectoryServiceSimpleADVpcSettings.ps1 |   4 +-
 ...Add-VSDynamoDBTableAttributeDefinition.ps1 |   6 +-
 ...dd-VSDynamoDBTableGlobalSecondaryIndex.ps1 |   4 +-
 .../Add-VSDynamoDBTableKeySchema.ps1          |   6 +-
 ...Add-VSDynamoDBTableLocalSecondaryIndex.ps1 |   4 +-
 ...BTablePointInTimeRecoverySpecification.ps1 |   2 +-
 .../Add-VSDynamoDBTableProjection.ps1         |   4 +-
 ...d-VSDynamoDBTableProvisionedThroughput.ps1 |   2 +-
 .../Add-VSDynamoDBTableSSESpecification.ps1   |   2 +-
 ...Add-VSDynamoDBTableStreamSpecification.ps1 |   4 +-
 ...VSDynamoDBTableTimeToLiveSpecification.ps1 |   4 +-
 .../Add-VSEC2InstanceAssociationParameter.ps1 |   4 +-
 .../Add-VSEC2InstanceBlockDeviceMapping.ps1   |   6 +-
 .../Add-VSEC2InstanceCreditSpecification.ps1  |   4 +-
 .../Add-VSEC2InstanceEbs.ps1                  |   6 +-
 ...d-VSEC2InstanceElasticGpuSpecification.ps1 |   4 +-
 .../Add-VSEC2InstanceInstanceIpv6Address.ps1  |   4 +-
 ...EC2InstanceLaunchTemplateSpecification.ps1 |   8 +-
 .../Add-VSEC2InstanceNetworkInterface.ps1     |  12 +-
 .../Add-VSEC2InstanceNoDevice.ps1             |   2 +-
 ...2InstancePrivateIpAddressSpecification.ps1 |   4 +-
 .../Add-VSEC2InstanceSsmAssociation.ps1       |   4 +-
 .../Add-VSEC2InstanceVolume.ps1               |   6 +-
 ...-VSEC2LaunchTemplateBlockDeviceMapping.ps1 |   8 +-
 ...VSEC2LaunchTemplateCreditSpecification.ps1 |   4 +-
 .../Add-VSEC2LaunchTemplateEbs.ps1            |   8 +-
 ...2LaunchTemplateElasticGpuSpecification.ps1 |   4 +-
 ...-VSEC2LaunchTemplateIamInstanceProfile.ps1 |   6 +-
 ...EC2LaunchTemplateInstanceMarketOptions.ps1 |   4 +-
 .../Add-VSEC2LaunchTemplateIpv6Add.ps1        |   4 +-
 ...-VSEC2LaunchTemplateLaunchTemplateData.ps1 |  14 +-
 .../Add-VSEC2LaunchTemplateMonitoring.ps1     |   2 +-
 ...dd-VSEC2LaunchTemplateNetworkInterface.ps1 |  10 +-
 .../Add-VSEC2LaunchTemplatePlacement.ps1      |  12 +-
 .../Add-VSEC2LaunchTemplatePrivateIpAdd.ps1   |   4 +-
 .../Add-VSEC2LaunchTemplateSpotOptions.ps1    |   8 +-
 ...dd-VSEC2LaunchTemplateTagSpecification.ps1 |   4 +-
 .../Add-VSEC2NetworkAclEntryIcmp.ps1          |   2 +-
 .../Add-VSEC2NetworkAclEntryPortRange.ps1     |   2 +-
 ...EC2NetworkInterfaceInstanceIpv6Address.ps1 |   4 +-
 ...InterfacePrivateIpAddressSpecification.ps1 |   4 +-
 .../Add-VSEC2SecurityGroupEgress.ps1          |  14 +-
 .../Add-VSEC2SecurityGroupIngress.ps1         |  16 +--
 .../Add-VSEC2SpotFleetBlockDeviceMapping.ps1  |   8 +-
 .../Add-VSEC2SpotFleetEbsBlockDevice.ps1      |   6 +-
 .../Add-VSEC2SpotFleetGroupIdentifier.ps1     |   4 +-
 ...otFleetIamInstanceProfileSpecification.ps1 |   4 +-
 .../Add-VSEC2SpotFleetInstanceIpv6Address.ps1 |   4 +-
 ...tInstanceNetworkInterfaceSpecification.ps1 |   8 +-
 ...SpotFleetPrivateIpAddressSpecification.ps1 |   4 +-
 ...2SpotFleetSpotFleetLaunchSpecification.ps1 |  16 +--
 .../Add-VSEC2SpotFleetSpotFleetMonitoring.ps1 |   2 +-
 ...EC2SpotFleetSpotFleetRequestConfigData.ps1 |  16 +--
 ...SEC2SpotFleetSpotFleetTagSpecification.ps1 |   4 +-
 .../Add-VSEC2SpotFleetSpotPlacement.ps1       |   6 +-
 ...onnectionVpnTunnelOptionsSpecification.ps1 |   6 +-
 .../Add-VSECRRepositoryLifecyclePolicy.ps1    |   6 +-
 .../Add-VSECSServiceAwsVpcConfiguration.ps1   |   4 +-
 ...dd-VSECSServiceDeploymentConfiguration.ps1 |   2 +-
 .../Add-VSECSServiceLoadBalancer.ps1          |   8 +-
 .../Add-VSECSServiceNetworkConfiguration.ps1  |   2 +-
 .../Add-VSECSServicePlacementConstraint.ps1   |   6 +-
 .../Add-VSECSServicePlacementStrategy.ps1     |   6 +-
 .../Add-VSECSServiceServiceRegistry.ps1       |   4 +-
 ...VSECSTaskDefinitionContainerDefinition.ps1 |  12 +-
 .../Add-VSECSTaskDefinitionDevice.ps1         |   6 +-
 .../Add-VSECSTaskDefinitionHealthCheck.ps1    |   2 +-
 .../Add-VSECSTaskDefinitionHostEntry.ps1      |   6 +-
 ...SECSTaskDefinitionHostVolumeProperties.ps1 |   4 +-
 ...-VSECSTaskDefinitionKernelCapabilities.ps1 |   2 +-
 .../Add-VSECSTaskDefinitionKeyValuePair.ps1   |   6 +-
 ...Add-VSECSTaskDefinitionLinuxParameters.ps1 |   2 +-
 ...dd-VSECSTaskDefinitionLogConfiguration.ps1 |   4 +-
 .../Add-VSECSTaskDefinitionMountPoint.ps1     |   6 +-
 .../Add-VSECSTaskDefinitionPortMapping.ps1    |   4 +-
 ...itionTaskDefinitionPlacementConstraint.ps1 |   6 +-
 .../Add-VSECSTaskDefinitionUlimit.ps1         |   4 +-
 .../Add-VSECSTaskDefinitionVolume.ps1         |   4 +-
 .../Add-VSECSTaskDefinitionVolumeFrom.ps1     |   4 +-
 ...dd-VSEFSFileSystemElasticFileSystemTag.ps1 |   6 +-
 .../Add-VSEKSClusterResourcesVpcConfig.ps1    |   2 +-
 .../Add-VSEMRClusterApplication.ps1           |   6 +-
 .../Add-VSEMRClusterAutoScalingPolicy.ps1     |   2 +-
 .../Add-VSEMRClusterBootstrapActionConfig.ps1 |   4 +-
 ...-VSEMRClusterCloudWatchAlarmDefinition.ps1 |  12 +-
 .../Add-VSEMRClusterConfiguration.ps1         |   4 +-
 .../Add-VSEMRClusterEbsBlockDeviceConfig.ps1  |   2 +-
 .../Add-VSEMRClusterEbsConfiguration.ps1      |   2 +-
 .../Add-VSEMRClusterInstanceFleetConfig.ps1   |   4 +-
 ...nstanceFleetProvisioningSpecifications.ps1 |   2 +-
 .../Add-VSEMRClusterInstanceGroupConfig.ps1   |  10 +-
 .../Add-VSEMRClusterInstanceTypeConfig.ps1    |   6 +-
 ...Add-VSEMRClusterJobFlowInstancesConfig.ps1 |  14 +-
 .../Add-VSEMRClusterKerberosAttributes.ps1    | 125 ++++++++++++++++++
 .../Add-VSEMRClusterMetricDimension.ps1       |   6 +-
 .../Add-VSEMRClusterPlacementType.ps1         |   4 +-
 .../Add-VSEMRClusterScalingAction.ps1         |   4 +-
 .../Add-VSEMRClusterScalingConstraints.ps1    |   2 +-
 .../Add-VSEMRClusterScalingRule.ps1           |   6 +-
 .../Add-VSEMRClusterScalingTrigger.ps1        |   2 +-
 ...SEMRClusterScriptBootstrapActionConfig.ps1 |   4 +-
 ...lusterSimpleScalingPolicyConfiguration.ps1 |   4 +-
 ...MRClusterSpotProvisioningSpecification.ps1 |   4 +-
 .../Add-VSEMRClusterVolumeSpecification.ps1   |   4 +-
 ...-VSEMRInstanceFleetConfigConfiguration.ps1 |   4 +-
 ...nstanceFleetConfigEbsBlockDeviceConfig.ps1 |   2 +-
 ...EMRInstanceFleetConfigEbsConfiguration.ps1 |   2 +-
 ...nstanceFleetProvisioningSpecifications.ps1 |   2 +-
 ...RInstanceFleetConfigInstanceTypeConfig.ps1 |   6 +-
 ...eetConfigSpotProvisioningSpecification.ps1 |   4 +-
 ...InstanceFleetConfigVolumeSpecification.ps1 |   4 +-
 ...MRInstanceGroupConfigAutoScalingPolicy.ps1 |   2 +-
 ...ceGroupConfigCloudWatchAlarmDefinition.ps1 |  12 +-
 ...-VSEMRInstanceGroupConfigConfiguration.ps1 |   4 +-
 ...nstanceGroupConfigEbsBlockDeviceConfig.ps1 |   2 +-
 ...EMRInstanceGroupConfigEbsConfiguration.ps1 |   2 +-
 ...SEMRInstanceGroupConfigMetricDimension.ps1 |   6 +-
 ...-VSEMRInstanceGroupConfigScalingAction.ps1 |   4 +-
 ...RInstanceGroupConfigScalingConstraints.ps1 |   2 +-
 ...dd-VSEMRInstanceGroupConfigScalingRule.ps1 |   6 +-
 ...VSEMRInstanceGroupConfigScalingTrigger.ps1 |   2 +-
 ...ConfigSimpleScalingPolicyConfiguration.ps1 |   4 +-
 ...InstanceGroupConfigVolumeSpecification.ps1 |   4 +-
 .../Add-VSEMRStepHadoopJarStepConfig.ps1      |   6 +-
 .../Add-VSEMRStepKeyValue.ps1                 |   6 +-
 ...ReplicationGroupNodeGroupConfiguration.ps1 |   6 +-
 ...tionApplicationResourceLifecycleConfig.ps1 |   4 +-
 ...ationApplicationVersionLifecycleConfig.ps1 |   2 +-
 ...SElasticBeanstalkApplicationMaxAgeRule.ps1 |   2 +-
 ...lasticBeanstalkApplicationMaxCountRule.ps1 |   2 +-
 ...eanstalkApplicationVersionSourceBundle.ps1 |   6 +-
 ...tionTemplateConfigurationOptionSetting.ps1 |  10 +-
 ...nfigurationTemplateSourceConfiguration.ps1 |   6 +-
 ...asticBeanstalkEnvironmentOptionSetting.ps1 |  10 +-
 .../Add-VSElasticBeanstalkEnvironmentTier.ps1 |   8 +-
 ...lancingLoadBalancerAccessLoggingPolicy.ps1 |   6 +-
 ...gLoadBalancerAppCookieStickinessPolicy.ps1 |   6 +-
 ...ngLoadBalancerConnectionDrainingPolicy.ps1 |   2 +-
 ...alancingLoadBalancerConnectionSettings.ps1 |   2 +-
 ...icLoadBalancingLoadBalancerHealthCheck.ps1 |  12 +-
 ...ngLoadBalancerLBCookieStickinessPolicy.ps1 |   6 +-
 ...sticLoadBalancingLoadBalancerListeners.ps1 |  12 +-
 ...asticLoadBalancingLoadBalancerPolicies.ps1 |   6 +-
 ...VSElasticLoadBalancingV2ListenerAction.ps1 |   6 +-
 ...sticLoadBalancingV2ListenerCertificate.ps1 |   4 +-
 ...ancingV2ListenerCertificateCertificate.ps1 |   4 +-
 ...asticLoadBalancingV2ListenerRuleAction.ps1 |   6 +-
 ...adBalancingV2ListenerRuleRuleCondition.ps1 |   4 +-
 ...ingV2LoadBalancerLoadBalancerAttribute.ps1 |   6 +-
 ...adBalancingV2LoadBalancerSubnetMapping.ps1 |   6 +-
 ...asticLoadBalancingV2TargetGroupMatcher.ps1 |   4 +-
 ...alancingV2TargetGroupTargetDescription.ps1 |   6 +-
 ...ncingV2TargetGroupTargetGroupAttribute.ps1 |   6 +-
 .../Add-VSElasticsearchDomainEBSOptions.ps1   |   4 +-
 ...searchDomainElasticsearchClusterConfig.ps1 |   6 +-
 ...ticsearchDomainEncryptionAtRestOptions.ps1 |   4 +-
 ...d-VSElasticsearchDomainSnapshotOptions.ps1 |   2 +-
 .../Add-VSElasticsearchDomainVPCOptions.ps1   |   2 +-
 .../Add-VSEventsRuleEcsParameters.ps1         |   4 +-
 .../Add-VSEventsRuleInputTransformer.ps1      |   4 +-
 .../Add-VSEventsRuleKinesisParameters.ps1     |   4 +-
 .../Add-VSEventsRuleRunCommandParameters.ps1  |   2 +-
 .../Add-VSEventsRuleRunCommandTarget.ps1      |   4 +-
 .../Add-VSEventsRuleTarget.ps1                |  12 +-
 .../Add-VSGameLiftAliasRoutingStrategy.ps1    |   8 +-
 .../Add-VSGameLiftBuildS3Location.ps1         |   8 +-
 .../Add-VSGameLiftFleetIpPermission.ps1       |   6 +-
 .../Add-VSGlueClassifierGrokClassifier.ps1    |  10 +-
 .../Add-VSGlueClassifierJsonClassifier.ps1    |   6 +-
 .../Add-VSGlueClassifierXMLClassifier.ps1     |   8 +-
 .../Add-VSGlueConnectionConnectionInput.ps1   |   8 +-
 ...nnectionPhysicalConnectionRequirements.ps1 |   6 +-
 .../Add-VSGlueCrawlerJdbcTarget.ps1           |   6 +-
 .../Add-VSGlueCrawlerS3Target.ps1             |   4 +-
 .../Add-VSGlueCrawlerSchedule.ps1             |   4 +-
 .../Add-VSGlueCrawlerSchemaChangePolicy.ps1   |   6 +-
 .../Add-VSGlueCrawlerTargets.ps1              |   2 +-
 .../Add-VSGlueDatabaseDatabaseInput.ps1       |   8 +-
 .../Add-VSGlueJobConnectionsList.ps1          |   2 +-
 .../Add-VSGlueJobExecutionProperty.ps1        |   2 +-
 .../Add-VSGlueJobJobCommand.ps1               |   6 +-
 .../Add-VSGluePartitionColumn.ps1             |   8 +-
 .../Add-VSGluePartitionOrder.ps1              |   4 +-
 .../Add-VSGluePartitionPartitionInput.ps1     |   2 +-
 .../Add-VSGluePartitionSerdeInfo.ps1          |   6 +-
 .../Add-VSGluePartitionSkewedInfo.ps1         |   2 +-
 .../Add-VSGluePartitionStorageDescriptor.ps1  |   8 +-
 .../Add-VSGlueTableColumn.ps1                 |   8 +-
 .../Add-VSGlueTableOrder.ps1                  |   4 +-
 .../Add-VSGlueTableSerdeInfo.ps1              |   6 +-
 .../Add-VSGlueTableSkewedInfo.ps1             |   2 +-
 .../Add-VSGlueTableStorageDescriptor.ps1      |   8 +-
 .../Add-VSGlueTableTableInput.ps1             |  14 +-
 .../Add-VSGlueTriggerAction.ps1               |   4 +-
 .../Add-VSGlueTriggerCondition.ps1            |   8 +-
 .../Add-VSGlueTriggerPredicate.ps1            |   4 +-
 .../Add-VSGuardDutyFilterCondition.ps1        |   2 +-
 .../Add-VSGuardDutyFilterFindingCriteria.ps1  |   2 +-
 .../Add-VSIAMGroupPolicy.ps1                  |   4 +-
 .../Add-VSIAMRolePolicy.ps1                   |   4 +-
 .../Add-VSIAMUserLoginProfile.ps1             |   4 +-
 .../Add-VSIAMUserPolicy.ps1                   |   4 +-
 .../Add-VSIoTThingAttributePayload.ps1        |   2 +-
 .../Add-VSIoTTopicRuleAction.ps1              |   2 +-
 ...dd-VSIoTTopicRuleCloudwatchAlarmAction.ps1 |  10 +-
 ...d-VSIoTTopicRuleCloudwatchMetricAction.ps1 |  14 +-
 .../Add-VSIoTTopicRuleDynamoDBAction.ps1      |  20 +--
 .../Add-VSIoTTopicRuleDynamoDBv2Action.ps1    |   4 +-
 .../Add-VSIoTTopicRuleElasticsearchAction.ps1 |  12 +-
 .../Add-VSIoTTopicRuleFirehoseAction.ps1      |   8 +-
 .../Add-VSIoTTopicRuleKinesisAction.ps1       |   8 +-
 .../Add-VSIoTTopicRuleLambdaAction.ps1        |   4 +-
 .../Add-VSIoTTopicRulePutItemInput.ps1        |   4 +-
 .../Add-VSIoTTopicRuleRepublishAction.ps1     |   6 +-
 .../Add-VSIoTTopicRuleS3Action.ps1            |   8 +-
 .../Add-VSIoTTopicRuleSnsAction.ps1           |   8 +-
 .../Add-VSIoTTopicRuleSqsAction.ps1           |   6 +-
 .../Add-VSIoTTopicRuleTopicRulePayload.ps1    |   8 +-
 ...alyticsApplicationCSVMappingParameters.ps1 |   6 +-
 ...Add-VSKinesisAnalyticsApplicationInput.ps1 |   4 +-
 ...alyticsApplicationInputLambdaProcessor.ps1 |   6 +-
 ...isAnalyticsApplicationInputParallelism.ps1 |   2 +-
 ...pplicationInputProcessingConfiguration.ps1 |   2 +-
 ...KinesisAnalyticsApplicationInputSchema.ps1 |   4 +-
 ...lyticsApplicationJSONMappingParameters.ps1 |   4 +-
 ...alyticsApplicationKinesisFirehoseInput.ps1 |   6 +-
 ...nalyticsApplicationKinesisStreamsInput.ps1 |   6 +-
 ...sAnalyticsApplicationMappingParameters.ps1 |   2 +-
 ...ticsApplicationOutputDestinationSchema.ps1 |   4 +-
 ...ApplicationOutputKinesisFirehoseOutput.ps1 |   6 +-
 ...sApplicationOutputKinesisStreamsOutput.ps1 |   6 +-
 ...AnalyticsApplicationOutputLambdaOutput.ps1 |   6 +-
 ...inesisAnalyticsApplicationOutputOutput.ps1 |   4 +-
 ...inesisAnalyticsApplicationRecordColumn.ps1 |   8 +-
 ...inesisAnalyticsApplicationRecordFormat.ps1 |   4 +-
 ...eferenceDataSourceCSVMappingParameters.ps1 |   6 +-
 ...ferenceDataSourceJSONMappingParameters.ps1 |   4 +-
 ...onReferenceDataSourceMappingParameters.ps1 |   2 +-
 ...icationReferenceDataSourceRecordColumn.ps1 |   8 +-
 ...icationReferenceDataSourceRecordFormat.ps1 |   4 +-
 ...ReferenceDataSourceReferenceDataSource.ps1 |   4 +-
 ...tionReferenceDataSourceReferenceSchema.ps1 |   4 +-
 ...ferenceDataSourceS3ReferenceDataSource.ps1 |   8 +-
 ...isFirehoseDeliveryStreamBufferingHints.ps1 |   2 +-
 ...DeliveryStreamCloudWatchLoggingOptions.ps1 |   6 +-
 ...nesisFirehoseDeliveryStreamCopyCommand.ps1 |   8 +-
 ...iveryStreamElasticsearchBufferingHints.ps1 |   2 +-
 ...mElasticsearchDestinationConfiguration.ps1 |  14 +-
 ...eliveryStreamElasticsearchRetryOptions.ps1 |   2 +-
 ...eDeliveryStreamEncryptionConfiguration.ps1 |   4 +-
 ...reamExtendedS3DestinationConfiguration.ps1 |  12 +-
 ...ehoseDeliveryStreamKMSEncryptionConfig.ps1 |   4 +-
 ...StreamKinesisStreamSourceConfiguration.ps1 |   6 +-
 ...eDeliveryStreamProcessingConfiguration.ps1 |   2 +-
 ...KinesisFirehoseDeliveryStreamProcessor.ps1 |   4 +-
 ...rehoseDeliveryStreamProcessorParameter.ps1 |   6 +-
 ...StreamRedshiftDestinationConfiguration.ps1 |  10 +-
 ...liveryStreamS3DestinationConfiguration.ps1 |  10 +-
 ...ryStreamSplunkDestinationConfiguration.ps1 |  10 +-
 ...rehoseDeliveryStreamSplunkRetryOptions.ps1 |   2 +-
 .../Add-VSKinesisStreamStreamEncryption.ps1   |   6 +-
 ...VSLambdaAliasAliasRoutingConfiguration.ps1 |   2 +-
 .../Add-VSLambdaAliasVersionWeight.ps1        |   4 +-
 .../Add-VSLambdaFunctionCode.ps1              |  10 +-
 .../Add-VSLambdaFunctionDeadLetterConfig.ps1  |   4 +-
 .../Add-VSLambdaFunctionEnvironment.ps1       |   2 +-
 .../Add-VSLambdaFunctionTracingConfig.ps1     |   4 +-
 .../Add-VSLambdaFunctionVpcConfig.ps1         |   2 +-
 ...VSLogsMetricFilterMetricTransformation.ps1 |   8 +-
 .../Add-VSOpsWorksAppDataSource.ps1           |   8 +-
 .../Add-VSOpsWorksAppEnvironmentVariable.ps1  |   6 +-
 .../Add-VSOpsWorksAppSource.ps1               |  14 +-
 .../Add-VSOpsWorksAppSslConfiguration.ps1     |   8 +-
 ...d-VSOpsWorksInstanceBlockDeviceMapping.ps1 |   8 +-
 .../Add-VSOpsWorksInstanceEbsBlockDevice.ps1  |   6 +-
 ...VSOpsWorksInstanceTimeBasedAutoScaling.ps1 |   2 +-
 ...d-VSOpsWorksLayerAutoScalingThresholds.ps1 |   2 +-
 ...sWorksLayerLifecycleEventConfiguration.ps1 |   2 +-
 ...dd-VSOpsWorksLayerLoadBasedAutoScaling.ps1 |   2 +-
 .../Add-VSOpsWorksLayerRecipes.ps1            |   2 +-
 ...psWorksLayerShutdownEventConfiguration.ps1 |   2 +-
 ...Add-VSOpsWorksLayerVolumeConfiguration.ps1 |   6 +-
 .../Add-VSOpsWorksStackChefConfiguration.ps1  |   4 +-
 .../Add-VSOpsWorksStackElasticIp.ps1          |   6 +-
 .../Add-VSOpsWorksStackRdsDbInstance.ps1      |   8 +-
 .../Add-VSOpsWorksStackSource.ps1             |  14 +-
 ...OpsWorksStackStackConfigurationManager.ps1 |   6 +-
 .../Add-VSRDSDBSecurityGroupIngress.ps1       |  10 +-
 ...dd-VSRDSOptionGroupOptionConfiguration.ps1 |   6 +-
 .../Add-VSRDSOptionGroupOptionSetting.ps1     |   6 +-
 ...Add-VSRedshiftClusterLoggingProperties.ps1 |   6 +-
 ...RedshiftClusterParameterGroupParameter.ps1 |   6 +-
 ...dd-VSRoute53HealthCheckAlarmIdentifier.ps1 |   6 +-
 ...-VSRoute53HealthCheckHealthCheckConfig.ps1 |  14 +-
 ...Add-VSRoute53HealthCheckHealthCheckTag.ps1 |   6 +-
 ...dd-VSRoute53HostedZoneHostedZoneConfig.ps1 |   4 +-
 .../Add-VSRoute53HostedZoneHostedZoneTag.ps1  |   6 +-
 ...-VSRoute53HostedZoneQueryLoggingConfig.ps1 |   4 +-
 .../Add-VSRoute53HostedZoneVPC.ps1            |   6 +-
 .../Add-VSRoute53RecordSetAliasTarget.ps1     |   6 +-
 .../Add-VSRoute53RecordSetGeoLocation.ps1     |   8 +-
 ...Add-VSRoute53RecordSetGroupAliasTarget.ps1 |   6 +-
 ...Add-VSRoute53RecordSetGroupGeoLocation.ps1 |   8 +-
 .../Add-VSRoute53RecordSetGroupRecordSet.ps1  |  22 +--
 ...S3BucketAbortIncompleteMultipartUpload.ps1 |   2 +-
 .../Add-VSS3BucketAccelerateConfiguration.ps1 |   4 +-
 ...Add-VSS3BucketAccessControlTranslation.ps1 |   4 +-
 .../Add-VSS3BucketAnalyticsConfiguration.ps1  |   6 +-
 .../Add-VSS3BucketBucketEncryption.ps1        |   2 +-
 .../Add-VSS3BucketCorsConfiguration.ps1       |   2 +-
 .../Add-VSS3BucketCorsRule.ps1                |   4 +-
 .../Add-VSS3BucketDataExport.ps1              |   4 +-
 .../Add-VSS3BucketDestination.ps1             |  10 +-
 .../Add-VSS3BucketEncryptionConfiguration.ps1 |   4 +-
 .../Add-VSS3BucketFilterRule.ps1              |   6 +-
 .../Add-VSS3BucketInventoryConfiguration.ps1  |  10 +-
 .../Add-VSS3BucketLambdaConfiguration.ps1     |   6 +-
 .../Add-VSS3BucketLifecycleConfiguration.ps1  |   2 +-
 .../Add-VSS3BucketLoggingConfiguration.ps1    |   6 +-
 .../Add-VSS3BucketMetricsConfiguration.ps1    |   6 +-
 ...-VSS3BucketNoncurrentVersionTransition.ps1 |   4 +-
 ...dd-VSS3BucketNotificationConfiguration.ps1 |   2 +-
 .../Add-VSS3BucketNotificationFilter.ps1      |   2 +-
 .../Add-VSS3BucketQueueConfiguration.ps1      |   6 +-
 .../Add-VSS3BucketRedirectAllRequestsTo.ps1   |   6 +-
 .../Add-VSS3BucketRedirectRule.ps1            |  12 +-
 ...Add-VSS3BucketReplicationConfiguration.ps1 |   4 +-
 .../Add-VSS3BucketReplicationDestination.ps1  |   8 +-
 .../Add-VSS3BucketReplicationRule.ps1         |   8 +-
 .../Add-VSS3BucketRoutingRule.ps1             |   2 +-
 .../Add-VSS3BucketRoutingRuleCondition.ps1    |   6 +-
 .../Add-VSS3BucketRule.ps1                    |   8 +-
 .../Add-VSS3BucketS3KeyFilter.ps1             |   2 +-
 ...SS3BucketServerSideEncryptionByDefault.ps1 |   6 +-
 ...Add-VSS3BucketServerSideEncryptionRule.ps1 |   2 +-
 .../Add-VSS3BucketSourceSelectionCriteria.ps1 |   2 +-
 .../Add-VSS3BucketSseKmsEncryptedObjects.ps1  |   4 +-
 .../Add-VSS3BucketStorageClassAnalysis.ps1    |   2 +-
 .../Add-VSS3BucketTagFilter.ps1               |   6 +-
 .../Add-VSS3BucketTopicConfiguration.ps1      |   6 +-
 .../Add-VSS3BucketTransition.ps1              |   4 +-
 .../Add-VSS3BucketVersioningConfiguration.ps1 |   4 +-
 .../Add-VSS3BucketWebsiteConfiguration.ps1    |   6 +-
 ...tEventDestinationCloudWatchDestination.ps1 |   2 +-
 ...EventDestinationDimensionConfiguration.ps1 |   8 +-
 ...ionSetEventDestinationEventDestination.ps1 |   4 +-
 ...tDestinationKinesisFirehoseDestination.ps1 |   6 +-
 .../Add-VSSESReceiptFilterFilter.ps1          |   4 +-
 .../Add-VSSESReceiptFilterIpFilter.ps1        |   6 +-
 .../Add-VSSESReceiptRuleAction.ps1            |   2 +-
 .../Add-VSSESReceiptRuleAddHeaderAction.ps1   |   6 +-
 .../Add-VSSESReceiptRuleBounceAction.ps1      |  12 +-
 .../Add-VSSESReceiptRuleLambdaAction.ps1      |   8 +-
 .../Add-VSSESReceiptRuleRule.ps1              |   6 +-
 .../Add-VSSESReceiptRuleS3Action.ps1          |  10 +-
 .../Add-VSSESReceiptRuleSNSAction.ps1         |   6 +-
 .../Add-VSSESReceiptRuleStopAction.ps1        |   6 +-
 .../Add-VSSESReceiptRuleWorkmailAction.ps1    |   6 +-
 .../Add-VSSESTemplateTemplate.ps1             |  10 +-
 .../Add-VSSNSTopicSubscription.ps1            |   6 +-
 ...ationInstanceAssociationOutputLocation.ps1 |   2 +-
 .../Add-VSSSMAssociationParameterValues.ps1   |   2 +-
 .../Add-VSSSMAssociationS3OutputLocation.ps1  |   6 +-
 .../Add-VSSSMAssociationTarget.ps1            |   4 +-
 ...-VSSSMMaintenanceWindowTaskLoggingInfo.ps1 |   8 +-
 ...kMaintenanceWindowAutomationParameters.ps1 |   4 +-
 ...wTaskMaintenanceWindowLambdaParameters.ps1 |   8 +-
 ...kMaintenanceWindowRunCommandParameters.ps1 |  14 +-
 ...intenanceWindowStepFunctionsParameters.ps1 |   6 +-
 ...aintenanceWindowTaskNotificationConfig.ps1 |   6 +-
 .../Add-VSSSMMaintenanceWindowTaskTarget.ps1  |   4 +-
 ...anceWindowTaskTaskInvocationParameters.ps1 |   2 +-
 .../Add-VSSSMPatchBaselinePatchFilter.ps1     |   4 +-
 ...Add-VSSSMPatchBaselinePatchFilterGroup.ps1 |   2 +-
 .../Add-VSSSMPatchBaselinePatchSource.ps1     |   6 +-
 .../Add-VSSSMPatchBaselineRule.ps1            |   4 +-
 .../Add-VSSSMPatchBaselineRuleGroup.ps1       |   2 +-
 ...geMakerEndpointConfigProductionVariant.ps1 |   8 +-
 ...dd-VSSageMakerModelContainerDefinition.ps1 |   8 +-
 .../Add-VSSageMakerModelVpcConfig.ps1         |   2 +-
 ...cleConfigNotebookInstanceLifecycleHook.ps1 |   4 +-
 ...nProductProvisioningArtifactProperties.ps1 |   6 +-
 ...rovisionedProductProvisioningParameter.ps1 |   6 +-
 ...Add-VSServiceDiscoveryServiceDnsConfig.ps1 |   6 +-
 ...Add-VSServiceDiscoveryServiceDnsRecord.ps1 |   6 +-
 ...rviceDiscoveryServiceHealthCheckConfig.ps1 |   6 +-
 ...iscoveryServiceHealthCheckCustomConfig.ps1 |   2 +-
 .../Resource Property Types/Add-VSTag.ps1     |  28 ++--
 .../Add-VSWAFByteMatchSetByteMatchTuple.ps1   |  10 +-
 .../Add-VSWAFByteMatchSetFieldToMatch.ps1     |   6 +-
 .../Add-VSWAFIPSetIPSetDescriptor.ps1         |   6 +-
 ...SWAFRegionalByteMatchSetByteMatchTuple.ps1 |  10 +-
 ...-VSWAFRegionalByteMatchSetFieldToMatch.ps1 |   6 +-
 .../Add-VSWAFRegionalIPSetIPSetDescriptor.ps1 |   6 +-
 .../Add-VSWAFRegionalRulePredicate.ps1        |   6 +-
 ...FRegionalSizeConstraintSetFieldToMatch.ps1 |   6 +-
 ...egionalSizeConstraintSetSizeConstraint.ps1 |   6 +-
 ...gionalSqlInjectionMatchSetFieldToMatch.ps1 |   6 +-
 ...njectionMatchSetSqlInjectionMatchTuple.ps1 |   4 +-
 .../Add-VSWAFRegionalWebACLAction.ps1         |   4 +-
 .../Add-VSWAFRegionalWebACLRule.ps1           |   4 +-
 ...d-VSWAFRegionalXssMatchSetFieldToMatch.ps1 |   6 +-
 ...-VSWAFRegionalXssMatchSetXssMatchTuple.ps1 |   4 +-
 .../Add-VSWAFRulePredicate.ps1                |   6 +-
 ...Add-VSWAFSizeConstraintSetFieldToMatch.ps1 |   6 +-
 ...d-VSWAFSizeConstraintSetSizeConstraint.ps1 |   6 +-
 ...-VSWAFSqlInjectionMatchSetFieldToMatch.ps1 |   6 +-
 ...njectionMatchSetSqlInjectionMatchTuple.ps1 |   4 +-
 .../Add-VSWAFWebACLActivatedRule.ps1          |   8 +-
 .../Add-VSWAFWebACLWafAction.ps1              |   4 +-
 .../Add-VSWAFXssMatchSetFieldToMatch.ps1      |   6 +-
 .../Add-VSWAFXssMatchSetXssMatchTuple.ps1     |   4 +-
 .../Resource Types/New-VSAmazonMQBroker.ps1   |  82 ++++++------
 .../New-VSAmazonMQConfiguration.ps1           |  12 +-
 .../New-VSApiGatewayAccount.ps1               |   4 +-
 .../Resource Types/New-VSApiGatewayApiKey.ps1 |   8 +-
 .../New-VSApiGatewayAuthorizer.ps1            |  18 +--
 .../New-VSApiGatewayBasePathMapping.ps1       |  10 +-
 .../New-VSApiGatewayClientCertificate.ps1     |   4 +-
 .../New-VSApiGatewayDeployment.ps1            |   8 +-
 .../New-VSApiGatewayDocumentationPart.ps1     |   6 +-
 .../New-VSApiGatewayDocumentationVersion.ps1  |   8 +-
 .../New-VSApiGatewayDomainName.ps1            |   8 +-
 .../New-VSApiGatewayGatewayResponse.ps1       |   8 +-
 .../Resource Types/New-VSApiGatewayMethod.ps1 |  16 +--
 .../Resource Types/New-VSApiGatewayModel.ps1  |  10 +-
 .../New-VSApiGatewayRequestValidator.ps1      |   6 +-
 .../New-VSApiGatewayResource.ps1              |   8 +-
 .../New-VSApiGatewayRestApi.ps1               |  10 +-
 .../Resource Types/New-VSApiGatewayStage.ps1  |  16 +--
 .../New-VSApiGatewayUsagePlan.ps1             |   6 +-
 .../New-VSApiGatewayUsagePlanKey.ps1          |   8 +-
 .../New-VSApiGatewayVpcLink.ps1               |   6 +-
 .../Resource Types/New-VSAppSyncApiKey.ps1    |   6 +-
 .../New-VSAppSyncDataSource.ps1               |  12 +-
 .../New-VSAppSyncGraphQLApi.ps1               |   6 +-
 .../New-VSAppSyncGraphQLSchema.ps1            |   8 +-
 .../Resource Types/New-VSAppSyncResolver.ps1  |  18 +--
 ...VSApplicationAutoScalingScalableTarget.ps1 |  10 +-
 ...-VSApplicationAutoScalingScalingPolicy.ps1 |  14 +-
 .../Resource Types/New-VSAthenaNamedQuery.ps1 |  10 +-
 .../New-VSAutoScalingAutoScalingGroup.ps1     |  22 +--
 .../New-VSAutoScalingLaunchConfiguration.ps1  |  24 ++--
 .../New-VSAutoScalingLifecycleHook.ps1        |  16 +--
 .../New-VSAutoScalingPlansScalingPlan.ps1     |   2 +-
 .../New-VSAutoScalingScalingPolicy.ps1        |  12 +-
 .../New-VSAutoScalingScheduledAction.ps1      |  10 +-
 .../New-VSBatchComputeEnvironment.ps1         |  10 +-
 .../New-VSBatchJobDefinition.ps1              |   6 +-
 .../Resource Types/New-VSBatchJobQueue.ps1    |   6 +-
 .../Resource Types/New-VSBudgetsBudget.ps1    |   2 +-
 .../New-VSCertificateManagerCertificate.ps1   |   6 +-
 .../New-VSCloud9EnvironmentEC2.ps1            |  12 +-
 .../New-VSCloudFormationCustomResource.ps1    |   4 +-
 .../New-VSCloudFormationStack.ps1             |   4 +-
 .../New-VSCloudFormationWaitCondition.ps1     |   6 +-
 ...ew-VSCloudFormationWaitConditionHandle.ps1 |   2 +-
 ...oudFrontCloudFrontOriginAccessIdentity.ps1 |   2 +-
 .../New-VSCloudFrontDistribution.ps1          |   2 +-
 .../New-VSCloudFrontStreamingDistribution.ps1 |   2 +-
 .../Resource Types/New-VSCloudTrailTrail.ps1  |  16 +--
 .../Resource Types/New-VSCloudWatchAlarm.ps1  |  22 +--
 .../New-VSCloudWatchDashboard.ps1             |   6 +-
 .../Resource Types/New-VSCodeBuildProject.ps1 |  10 +-
 .../New-VSCodeCommitRepository.ps1            |   6 +-
 .../New-VSCodeDeployApplication.ps1           |   6 +-
 .../New-VSCodeDeployDeploymentConfig.ps1      |   4 +-
 .../New-VSCodeDeployDeploymentGroup.ps1       |  10 +-
 .../New-VSCodePipelineCustomActionType.ps1    |   8 +-
 .../New-VSCodePipelinePipeline.ps1            |   6 +-
 .../New-VSCodePipelineWebhook.ps1             |  10 +-
 .../New-VSCognitoIdentityPool.ps1             |   6 +-
 ...ew-VSCognitoIdentityPoolRoleAttachment.ps1 |   4 +-
 .../Resource Types/New-VSCognitoUserPool.ps1  |  14 +-
 .../New-VSCognitoUserPoolClient.ps1           |   6 +-
 .../New-VSCognitoUserPoolGroup.ps1            |  10 +-
 .../New-VSCognitoUserPoolUser.ps1             |   8 +-
 ...VSCognitoUserPoolUserToGroupAttachment.ps1 |   8 +-
 .../New-VSConfigAggregationAuthorization.ps1  |   6 +-
 .../Resource Types/New-VSConfigConfigRule.ps1 |   8 +-
 .../New-VSConfigConfigurationAggregator.ps1   |   4 +-
 .../New-VSConfigConfigurationRecorder.ps1     |   6 +-
 .../New-VSConfigDeliveryChannel.ps1           |  10 +-
 .../Resource Types/New-VSDAXCluster.ps1       |  68 +++++-----
 .../New-VSDAXParameterGroup.ps1               |   6 +-
 .../Resource Types/New-VSDAXSubnetGroup.ps1   |   6 +-
 .../Resource Types/New-VSDMSCertificate.ps1   |   8 +-
 .../Resource Types/New-VSDMSEndpoint.ps1      |  24 ++--
 .../New-VSDMSEventSubscription.ps1            |   8 +-
 .../New-VSDMSReplicationInstance.ps1          |  16 +--
 .../New-VSDMSReplicationSubnetGroup.ps1       |   6 +-
 .../New-VSDMSReplicationTask.ps1              |  16 +--
 .../New-VSDataPipelinePipeline.ps1            |   6 +-
 .../New-VSDirectoryServiceMicrosoftAD.ps1     |  10 +-
 .../New-VSDirectoryServiceSimpleAD.ps1        |  12 +-
 .../Resource Types/New-VSDynamoDBTable.ps1    |   4 +-
 .../New-VSEC2CustomerGateway.ps1              |   6 +-
 .../Resource Types/New-VSEC2DHCPOptions.ps1   |   4 +-
 .../Public/Resource Types/New-VSEC2EIP.ps1    |   6 +-
 .../New-VSEC2EIPAssociation.ps1               |  12 +-
 .../New-VSEC2EgressOnlyInternetGateway.ps1    |   4 +-
 .../Resource Types/New-VSEC2FlowLog.ps1       |  12 +-
 .../Public/Resource Types/New-VSEC2Host.ps1   |   8 +-
 .../Resource Types/New-VSEC2Instance.ps1      |  32 ++---
 .../New-VSEC2InternetGateway.ps1              |   2 +-
 .../New-VSEC2LaunchTemplate.ps1               |   4 +-
 .../Resource Types/New-VSEC2NatGateway.ps1    |   6 +-
 .../Resource Types/New-VSEC2NetworkAcl.ps1    |   4 +-
 .../New-VSEC2NetworkAclEntry.ps1              |  10 +-
 .../New-VSEC2NetworkInterface.ps1             |  10 +-
 .../New-VSEC2NetworkInterfaceAttachment.ps1   |   8 +-
 .../New-VSEC2NetworkInterfacePermission.ps1   |   8 +-
 .../New-VSEC2PlacementGroup.ps1               |   4 +-
 .../Public/Resource Types/New-VSEC2Route.ps1  |  20 +--
 .../Resource Types/New-VSEC2RouteTable.ps1    |   4 +-
 .../Resource Types/New-VSEC2SecurityGroup.ps1 |   8 +-
 .../New-VSEC2SecurityGroupEgress.ps1          |  16 +--
 .../New-VSEC2SecurityGroupIngress.ps1         |  20 +--
 .../Resource Types/New-VSEC2SpotFleet.ps1     |   2 +-
 .../Public/Resource Types/New-VSEC2Subnet.ps1 |  10 +-
 .../New-VSEC2SubnetCidrBlock.ps1              |   6 +-
 .../New-VSEC2SubnetNetworkAclAssociation.ps1  |   6 +-
 .../New-VSEC2SubnetRouteTableAssociation.ps1  |   6 +-
 .../New-VSEC2TrunkInterfaceAssociation.ps1    |   6 +-
 .../Public/Resource Types/New-VSEC2VPC.ps1    |   6 +-
 .../Resource Types/New-VSEC2VPCCidrBlock.ps1  |   6 +-
 .../New-VSEC2VPCDHCPOptionsAssociation.ps1    |   6 +-
 .../Resource Types/New-VSEC2VPCEndpoint.ps1   |   8 +-
 ...VSEC2VPCEndpointConnectionNotification.ps1 |   8 +-
 ...New-VSEC2VPCEndpointServicePermissions.ps1 |   4 +-
 .../New-VSEC2VPCGatewayAttachment.ps1         |   8 +-
 .../New-VSEC2VPCPeeringConnection.ps1         |  27 +++-
 .../Resource Types/New-VSEC2VPNConnection.ps1 |   8 +-
 .../New-VSEC2VPNConnectionRoute.ps1           |   6 +-
 .../Resource Types/New-VSEC2VPNGateway.ps1    |   4 +-
 .../New-VSEC2VPNGatewayRoutePropagation.ps1   |   4 +-
 .../Public/Resource Types/New-VSEC2Volume.ps1 |  10 +-
 .../New-VSEC2VolumeAttachment.ps1             |   8 +-
 .../Resource Types/New-VSECRRepository.ps1    |   4 +-
 .../Resource Types/New-VSECSCluster.ps1       |   4 +-
 .../Resource Types/New-VSECSService.ps1       |  14 +-
 .../New-VSECSTaskDefinition.ps1               |  14 +-
 .../Resource Types/New-VSEFSFileSystem.ps1    |  32 ++++-
 .../Resource Types/New-VSEFSMountTarget.ps1   |   8 +-
 .../Resource Types/New-VSEKSCluster.ps1       |   8 +-
 .../Resource Types/New-VSEMRCluster.ps1       |  28 ++--
 .../New-VSEMRInstanceFleetConfig.ps1          |   8 +-
 .../New-VSEMRInstanceGroupConfig.ps1          |  14 +-
 .../New-VSEMRSecurityConfiguration.ps1        |   4 +-
 .../Public/Resource Types/New-VSEMRStep.ps1   |   8 +-
 .../New-VSElastiCacheCacheCluster.ps1         |  26 ++--
 .../New-VSElastiCacheParameterGroup.ps1       |   6 +-
 .../New-VSElastiCacheReplicationGroup.ps1     |  30 ++---
 .../New-VSElastiCacheSecurityGroup.ps1        |   4 +-
 .../New-VSElastiCacheSecurityGroupIngress.ps1 |   8 +-
 .../New-VSElastiCacheSubnetGroup.ps1          |   6 +-
 .../New-VSElasticBeanstalkApplication.ps1     |   6 +-
 ...w-VSElasticBeanstalkApplicationVersion.ps1 |   6 +-
 ...SElasticBeanstalkConfigurationTemplate.ps1 |  12 +-
 .../New-VSElasticBeanstalkEnvironment.ps1     |  18 +--
 ...New-VSElasticLoadBalancingLoadBalancer.ps1 |   6 +-
 .../New-VSElasticLoadBalancingV2Listener.ps1  |   8 +-
 ...sticLoadBalancingV2ListenerCertificate.ps1 |   4 +-
 ...w-VSElasticLoadBalancingV2ListenerRule.ps1 |   4 +-
 ...w-VSElasticLoadBalancingV2LoadBalancer.ps1 |  10 +-
 ...ew-VSElasticLoadBalancingV2TargetGroup.ps1 |  16 +--
 .../New-VSElasticsearchDomain.ps1             |   6 +-
 .../Resource Types/New-VSEventsRule.ps1       |  12 +-
 .../Resource Types/New-VSGameLiftAlias.ps1    |   6 +-
 .../Resource Types/New-VSGameLiftBuild.ps1    |   6 +-
 .../Resource Types/New-VSGameLiftFleet.ps1    |  14 +-
 .../Resource Types/New-VSGlueClassifier.ps1   |   2 +-
 .../Resource Types/New-VSGlueConnection.ps1   |   4 +-
 .../Resource Types/New-VSGlueCrawler.ps1      |  14 +-
 .../Resource Types/New-VSGlueDatabase.ps1     |   4 +-
 .../Resource Types/New-VSGlueDevEndpoint.ps1  |  14 +-
 .../Public/Resource Types/New-VSGlueJob.ps1   |  10 +-
 .../Resource Types/New-VSGluePartition.ps1    |   8 +-
 .../Public/Resource Types/New-VSGlueTable.ps1 |   6 +-
 .../Resource Types/New-VSGlueTrigger.ps1      |  10 +-
 .../New-VSGuardDutyDetector.ps1               |   2 +-
 .../Resource Types/New-VSGuardDutyFilter.ps1  |  10 +-
 .../Resource Types/New-VSGuardDutyIPSet.ps1   |  10 +-
 .../Resource Types/New-VSGuardDutyMaster.ps1  |   8 +-
 .../Resource Types/New-VSGuardDutyMember.ps1  |  12 +-
 .../New-VSGuardDutyThreatIntelSet.ps1         |  10 +-
 .../Resource Types/New-VSIAMAccessKey.ps1     |   6 +-
 .../Public/Resource Types/New-VSIAMGroup.ps1  |   6 +-
 .../New-VSIAMInstanceProfile.ps1              |   6 +-
 .../Resource Types/New-VSIAMManagedPolicy.ps1 |   8 +-
 .../Public/Resource Types/New-VSIAMPolicy.ps1 |   4 +-
 .../Public/Resource Types/New-VSIAMRole.ps1   |   6 +-
 .../New-VSIAMServiceLinkedRole.ps1            |   8 +-
 .../Public/Resource Types/New-VSIAMUser.ps1   |   6 +-
 .../New-VSIAMUserToGroupAddition.ps1          |   4 +-
 .../New-VSInspectorAssessmentTarget.ps1       |   6 +-
 .../New-VSInspectorAssessmentTemplate.ps1     |   6 +-
 .../New-VSInspectorResourceGroup.ps1          |   2 +-
 .../Resource Types/New-VSIoTCertificate.ps1   |   6 +-
 .../Public/Resource Types/New-VSIoTPolicy.ps1 |   4 +-
 .../New-VSIoTPolicyPrincipalAttachment.ps1    |   6 +-
 .../Public/Resource Types/New-VSIoTThing.ps1  |   4 +-
 .../New-VSIoTThingPrincipalAttachment.ps1     |   6 +-
 .../Resource Types/New-VSIoTTopicRule.ps1     |   4 +-
 .../Public/Resource Types/New-VSKMSAlias.ps1  |   6 +-
 .../Public/Resource Types/New-VSKMSKey.ps1    |   6 +-
 .../New-VSKinesisAnalyticsApplication.ps1     |   8 +-
 ...ew-VSKinesisAnalyticsApplicationOutput.ps1 |   4 +-
 ...nalyticsApplicationReferenceDataSource.ps1 |   4 +-
 .../New-VSKinesisFirehoseDeliveryStream.ps1   |   6 +-
 .../Resource Types/New-VSKinesisStream.ps1    |   4 +-
 .../Resource Types/New-VSLambdaAlias.ps1      |  10 +-
 .../New-VSLambdaEventSourceMapping.ps1        |   8 +-
 .../Resource Types/New-VSLambdaFunction.ps1   |  14 +-
 .../Resource Types/New-VSLambdaPermission.ps1 |  14 +-
 .../Resource Types/New-VSLambdaVersion.ps1    |   8 +-
 .../Resource Types/New-VSLogsDestination.ps1  |  10 +-
 .../Resource Types/New-VSLogsLogGroup.ps1     |   4 +-
 .../Resource Types/New-VSLogsLogStream.ps1    |   6 +-
 .../Resource Types/New-VSLogsMetricFilter.ps1 |   6 +-
 .../New-VSLogsSubscriptionFilter.ps1          |  10 +-
 .../Resource Types/New-VSNeptuneDBCluster.ps1 |  16 +--
 .../New-VSNeptuneDBClusterParameterGroup.ps1  |   8 +-
 .../New-VSNeptuneDBInstance.ps1               |  18 +--
 .../New-VSNeptuneDBParameterGroup.ps1         |   8 +-
 .../New-VSNeptuneDBSubnetGroup.ps1            |   6 +-
 .../Resource Types/New-VSOpsWorksApp.ps1      |  12 +-
 ...SOpsWorksElasticLoadBalancerAttachment.ps1 |   6 +-
 .../Resource Types/New-VSOpsWorksInstance.ps1 |  30 ++---
 .../Resource Types/New-VSOpsWorksLayer.ps1    |  12 +-
 .../Resource Types/New-VSOpsWorksStack.ps1    |  28 ++--
 .../New-VSOpsWorksUserProfile.ps1             |   8 +-
 .../Resource Types/New-VSOpsWorksVolume.ps1   |  10 +-
 .../Resource Types/New-VSRDSDBCluster.ps1     |  28 ++--
 .../New-VSRDSDBClusterParameterGroup.ps1      |   6 +-
 .../Resource Types/New-VSRDSDBInstance.ps1    |  58 ++++----
 .../New-VSRDSDBParameterGroup.ps1             |   6 +-
 .../New-VSRDSDBSecurityGroup.ps1              |   6 +-
 .../New-VSRDSDBSecurityGroupIngress.ps1       |  12 +-
 .../Resource Types/New-VSRDSDBSubnetGroup.ps1 |   6 +-
 .../New-VSRDSEventSubscription.ps1            |   6 +-
 .../Resource Types/New-VSRDSOptionGroup.ps1   |   8 +-
 .../Resource Types/New-VSRedshiftCluster.ps1  |  38 +++---
 .../New-VSRedshiftClusterParameterGroup.ps1   |   6 +-
 .../New-VSRedshiftClusterSecurityGroup.ps1    |   4 +-
 ...-VSRedshiftClusterSecurityGroupIngress.ps1 |  10 +-
 .../New-VSRedshiftClusterSubnetGroup.ps1      |   4 +-
 .../New-VSRoute53HealthCheck.ps1              |   2 +-
 .../New-VSRoute53HostedZone.ps1               |   4 +-
 .../Resource Types/New-VSRoute53RecordSet.ps1 |  22 +--
 .../New-VSRoute53RecordSetGroup.ps1           |   8 +-
 .../Public/Resource Types/New-VSS3Bucket.ps1  |   6 +-
 .../Resource Types/New-VSS3BucketPolicy.ps1   |   4 +-
 .../Public/Resource Types/New-VSSDBDomain.ps1 |   4 +-
 .../New-VSSESConfigurationSet.ps1             |   4 +-
 ...-VSSESConfigurationSetEventDestination.ps1 |   4 +-
 .../Resource Types/New-VSSESReceiptFilter.ps1 |   2 +-
 .../Resource Types/New-VSSESReceiptRule.ps1   |   6 +-
 .../New-VSSESReceiptRuleSet.ps1               |   4 +-
 .../Resource Types/New-VSSESTemplate.ps1      |   2 +-
 .../Resource Types/New-VSSNSSubscription.ps1  | 102 +++++++++++++-
 .../Public/Resource Types/New-VSSNSTopic.ps1  |   6 +-
 .../Resource Types/New-VSSNSTopicPolicy.ps1   |   2 +-
 .../Public/Resource Types/New-VSSQSQueue.ps1  |  31 ++++-
 .../Resource Types/New-VSSQSQueuePolicy.ps1   |   2 +-
 .../Resource Types/New-VSSSMAssociation.ps1   |  12 +-
 .../Resource Types/New-VSSSMDocument.ps1      |   4 +-
 .../New-VSSSMMaintenanceWindowTask.ps1        |  18 +--
 .../Resource Types/New-VSSSMParameter.ps1     |  12 +-
 .../Resource Types/New-VSSSMPatchBaseline.ps1 |  10 +-
 .../New-VSSSMResourceDataSync.ps1             |  14 +-
 .../New-VSSageMakerEndpoint.ps1               |   6 +-
 .../New-VSSageMakerEndpointConfig.ps1         |   6 +-
 .../Resource Types/New-VSSageMakerModel.ps1   |   6 +-
 .../New-VSSageMakerNotebookInstance.ps1       |  16 +--
 ...geMakerNotebookInstanceLifecycleConfig.ps1 |   4 +-
 ...VSServiceCatalogAcceptedPortfolioShare.ps1 |   6 +-
 ...-VSServiceCatalogCloudFormationProduct.ps1 |  18 +--
 ...atalogCloudFormationProvisionedProduct.ps1 |  16 +--
 ...iceCatalogLaunchNotificationConstraint.ps1 |  10 +-
 ...w-VSServiceCatalogLaunchRoleConstraint.ps1 |  12 +-
 ...ServiceCatalogLaunchTemplateConstraint.ps1 |  12 +-
 .../New-VSServiceCatalogPortfolio.ps1         |  10 +-
 ...ceCatalogPortfolioPrincipalAssociation.ps1 |  10 +-
 ...viceCatalogPortfolioProductAssociation.ps1 |  10 +-
 .../New-VSServiceCatalogPortfolioShare.ps1    |   8 +-
 .../New-VSServiceCatalogTagOption.ps1         |   6 +-
 ...w-VSServiceCatalogTagOptionAssociation.ps1 |   6 +-
 .../New-VSServiceDiscoveryInstance.ps1        |   6 +-
 ...-VSServiceDiscoveryPrivateDnsNamespace.ps1 |   8 +-
 ...w-VSServiceDiscoveryPublicDnsNamespace.ps1 |   6 +-
 .../New-VSServiceDiscoveryService.ps1         |   6 +-
 .../New-VSStepFunctionsActivity.ps1           |   4 +-
 .../New-VSStepFunctionsStateMachine.ps1       |   8 +-
 .../Resource Types/New-VSWAFByteMatchSet.ps1  |   4 +-
 .../Public/Resource Types/New-VSWAFIPSet.ps1  |   4 +-
 .../New-VSWAFRegionalByteMatchSet.ps1         |   4 +-
 .../Resource Types/New-VSWAFRegionalIPSet.ps1 |   4 +-
 .../Resource Types/New-VSWAFRegionalRule.ps1  |   6 +-
 .../New-VSWAFRegionalSizeConstraintSet.ps1    |   4 +-
 .../New-VSWAFRegionalSqlInjectionMatchSet.ps1 |   4 +-
 .../New-VSWAFRegionalWebACL.ps1               |   6 +-
 .../New-VSWAFRegionalWebACLAssociation.ps1    |   6 +-
 .../New-VSWAFRegionalXssMatchSet.ps1          |   4 +-
 .../Public/Resource Types/New-VSWAFRule.ps1   |   6 +-
 .../New-VSWAFSizeConstraintSet.ps1            |   4 +-
 .../New-VSWAFSqlInjectionMatchSet.ps1         |   4 +-
 .../Public/Resource Types/New-VSWAFWebACL.ps1 |   6 +-
 .../Resource Types/New-VSWAFXssMatchSet.ps1   |   4 +-
 .../New-VSWorkSpacesWorkspace.ps1             |  10 +-
 VaporShell/VaporShell.psd1                    |   2 +-
 880 files changed, 3419 insertions(+), 3005 deletions(-)
 create mode 100644 VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerLogList.ps1
 create mode 100644 VaporShell/Public/Resource Property Types/Add-VSDAXClusterSSESpecification.ps1
 create mode 100644 VaporShell/Public/Resource Property Types/Add-VSEMRClusterKerberosAttributes.ps1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5e883ff..15c75174a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,39 @@
-# Changelog 
+# Changelog <!-- omit in toc -->
 
 <!-- TOC -->
 
-- [Changelog](#changelog)
-    - [2.4.0](#240)
-    - [2.3.0](#230)
-    - [2.2.1](#221)
-    - [2.2.0](#220)
-    - [2.1.2](#212)
-    - [2.1.1](#211)
-    - [2.1.0](#210)
-    - [2.0.3](#203)
-    - [2.0.0](#200)
-    - [1.2.3](#123)
-    - [1.2.2](#122)
-    - [1.2.0](#120)
-    - [1.1.5](#115)
-    - [1.1.0](#110)
-    - [1.0.0](#100)
-    - [0.7.10](#0710)
-    - [0.7.09](#0709)
-    - [0.7.08](#0708)
-    - [0.7.07](#0707)
-    - [0.7.06](#0706)
-    - [0.7.05](#0705)
-    - [0.7.04](#0704)
-    - [0.7.03](#0703)
-    - [0.7.02](#0702)
+- [2.4.1](#241)
+- [2.4.0](#240)
+- [2.3.0](#230)
+- [2.2.1](#221)
+- [2.2.0](#220)
+- [2.1.2](#212)
+- [2.1.1](#211)
+- [2.1.0](#210)
+- [2.0.3](#203)
+- [2.0.0](#200)
+- [1.2.3](#123)
+- [1.2.2](#122)
+- [1.2.0](#120)
+- [1.1.5](#115)
+- [1.1.0](#110)
+- [1.0.0](#100)
+- [0.7.10](#0710)
+- [0.7.09](#0709)
+- [0.7.08](#0708)
+- [0.7.07](#0707)
+- [0.7.06](#0706)
+- [0.7.05](#0705)
+- [0.7.04](#0704)
+- [0.7.03](#0703)
+- [0.7.02](#0702)
 
 <!-- /TOC -->
 
+## 2.4.1
+
+- Added `Vaporshell.Condition` to the acceptible types for standard resource parameters ([Issue #35](https://github.com/scrthq/VaporShell/issues/35))
+
 ## 2.4.0
 
 - Added `ToString()` method override to `New-VaporResource` for convenience during template building [Issue #34](https://github.com/scrthq/VaporShell/issues/34)
diff --git a/VaporShell/Private/Convert-SpecToFunction.ps1 b/VaporShell/Private/Convert-SpecToFunction.ps1
index 73e34b928..fcfcbcdf1 100644
--- a/VaporShell/Private/Convert-SpecToFunction.ps1
+++ b/VaporShell/Private/Convert-SpecToFunction.ps1
@@ -262,7 +262,7 @@ function $FunctionName {
                 $scriptContents += @"
         [parameter(Mandatory = $Mandatory)]
         [ValidateScript( {
-                `$allowedTypes = "System.String","Vaporshell.Function"
+                `$allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]`$(`$_.PSTypeNames) -match "(`$((`$allowedTypes|ForEach-Object{[RegEx]::Escape(`$_)}) -join '|'))") {
                     `$true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerConfigurationId.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerConfigurationId.ps1
index f87fc6d44..7eb390c0c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerConfigurationId.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerConfigurationId.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerConfigurationId {
+function Add-VSAmazonMQBrokerConfigurationId {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.ConfigurationId resource property to the template
@@ -33,7 +33,7 @@
         $Revision,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerLogList.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerLogList.ps1
new file mode 100644
index 000000000..0c457fecd
--- /dev/null
+++ b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerLogList.ps1	
@@ -0,0 +1,54 @@
+function Add-VSAmazonMQBrokerLogList {
+    <#
+    .SYNOPSIS
+        Adds an AWS::AmazonMQ::Broker.LogList resource property to the template
+
+    .DESCRIPTION
+        Adds an AWS::AmazonMQ::Broker.LogList resource property to the template
+
+    .LINK
+        http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html
+
+    .PARAMETER Audit
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-audit    
+		PrimitiveType: Boolean    
+		UpdateType: Mutable    
+
+    .PARAMETER General
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-general    
+		PrimitiveType: Boolean    
+		UpdateType: Mutable    
+
+    .FUNCTIONALITY
+        Vaporshell
+    #>
+    [OutputType('Vaporshell.Resource.AmazonMQ.Broker.LogList')]
+    [cmdletbinding()]
+    Param
+    (
+        [parameter(Mandatory = $false)]
+        [System.Boolean]
+        $Audit,
+        [parameter(Mandatory = $false)]
+        [System.Boolean]
+        $General
+    )
+    Begin {
+        $obj = [PSCustomObject]@{}
+        $commonParams = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
+    }
+    Process {
+        foreach ($key in $PSBoundParameters.Keys | Where-Object {$commonParams -notcontains $_}) {
+            switch ($key) {
+                Default {
+                    $obj | Add-Member -MemberType NoteProperty -Name $key -Value $PSBoundParameters.$key
+                }
+            }
+        }
+    }
+    End {
+        $obj | Add-ObjectDetail -TypeName 'Vaporshell.Resource.AmazonMQ.Broker.LogList'
+    }
+}
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerMaintenanceWindow.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerMaintenanceWindow.ps1
index 17b91a9cb..76982c081 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerMaintenanceWindow.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerMaintenanceWindow.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerMaintenanceWindow {
+function Add-VSAmazonMQBrokerMaintenanceWindow {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.MaintenanceWindow resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $DayOfWeek,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $TimeOfDay,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerUser.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerUser.ps1
index 19c2d6661..090d230b0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerUser.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerUser.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerUser {
+function Add-VSAmazonMQBrokerUser {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.User resource property to the template
@@ -45,7 +45,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -61,7 +61,7 @@
         $ConsoleAccess,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayApiKeyStageKey.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayApiKeyStageKey.ps1
index 22ae8e59d..ab389dade 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayApiKeyStageKey.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayApiKeyStageKey.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayApiKeyStageKey {
+function Add-VSApiGatewayApiKeyStageKey {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::ApiKey.StageKey resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $RestApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentMethodSetting.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentMethodSetting.ps1
index 8ab858058..3a90b0931 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentMethodSetting.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentMethodSetting.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentMethodSetting {
+function Add-VSApiGatewayDeploymentMethodSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.MethodSetting resource property to the template
@@ -90,7 +90,7 @@
         $DataTraceEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $HttpMethod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -115,7 +115,7 @@
         $MetricsEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentStageDescription.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentStageDescription.ps1
index a6fb6f275..1d31ff9ed 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentStageDescription.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentStageDescription.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentStageDescription {
+function Add-VSApiGatewayDeploymentStageDescription {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.StageDescription resource property to the template
@@ -115,7 +115,7 @@
         $CacheClusterEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $CachingEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $DataTraceEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -171,7 +171,7 @@
         $DocumentationVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDocumentationPartLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDocumentationPartLocation.ps1
index d871ce291..f1f931958 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDocumentationPartLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDocumentationPartLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDocumentationPartLocation {
+function Add-VSApiGatewayDocumentationPartLocation {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DocumentationPart.Location resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $Method,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $Path,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $StatusCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDomainNameEndpointConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDomainNameEndpointConfiguration.ps1
index 1079be1e1..8648ff5f2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDomainNameEndpointConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayDomainNameEndpointConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDomainNameEndpointConfiguration {
+function Add-VSApiGatewayDomainNameEndpointConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DomainName.EndpointConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegration.ps1
index 27582525a..04fb8fe7c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodIntegration {
+function Add-VSApiGatewayMethodIntegration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.Integration resource property to the template
@@ -96,7 +96,7 @@
         $CacheKeyParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $CacheNamespace,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $ContentHandling,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -129,7 +129,7 @@
         $Credentials,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $IntegrationResponses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -168,7 +168,7 @@
         $RequestTemplates,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -179,7 +179,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegrationResponse.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegrationResponse.ps1
index be518d6bf..d4f9a5d14 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegrationResponse.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegrationResponse.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodIntegrationResponse {
+function Add-VSApiGatewayMethodIntegrationResponse {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.IntegrationResponse resource property to the template
@@ -52,7 +52,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -69,7 +69,7 @@
         $ResponseTemplates,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -80,7 +80,7 @@
         $SelectionPattern,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodMethodResponse.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodMethodResponse.ps1
index 6d556b80f..ac8851f07 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodMethodResponse.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodMethodResponse.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodMethodResponse {
+function Add-VSApiGatewayMethodMethodResponse {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.MethodResponse resource property to the template
@@ -46,7 +46,7 @@
         $ResponseParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiEndpointConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiEndpointConfiguration.ps1
index 5a80f92ad..75eddc34b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiEndpointConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiEndpointConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayRestApiEndpointConfiguration {
+function Add-VSApiGatewayRestApiEndpointConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RestApi.EndpointConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiS3Location.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiS3Location.ps1
index 0625e4cc0..fa805add5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiS3Location.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiS3Location.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayRestApiS3Location {
+function Add-VSApiGatewayRestApiS3Location {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RestApi.S3Location resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $Bucket,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $ETag,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageMethodSetting.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageMethodSetting.ps1
index f4bfc0d29..4c8821ea1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageMethodSetting.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageMethodSetting.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayStageMethodSetting {
+function Add-VSApiGatewayStageMethodSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Stage.MethodSetting resource property to the template
@@ -90,7 +90,7 @@
         $DataTraceEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $HttpMethod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -115,7 +115,7 @@
         $MetricsEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanApiStage.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanApiStage.ps1
index 513a75fe2..c2a8d6837 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanApiStage.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanApiStage.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanApiStage {
+function Add-VSApiGatewayUsagePlanApiStage {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.ApiStage resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanQuotaSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanQuotaSettings.ps1
index 432b3323c..cd4efd8e7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanQuotaSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanQuotaSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanQuotaSettings {
+function Add-VSApiGatewayUsagePlanQuotaSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.QuotaSettings resource property to the template
@@ -42,7 +42,7 @@
         $Offset,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanThrottleSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanThrottleSettings.ps1
index 2d6521820..2b2e31626 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanThrottleSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanThrottleSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanThrottleSettings {
+function Add-VSApiGatewayUsagePlanThrottleSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.ThrottleSettings resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceDynamoDBConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceDynamoDBConfig.ps1
index 4f10dd37c..77e4c528c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceDynamoDBConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceDynamoDBConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceDynamoDBConfig {
+function Add-VSAppSyncDataSourceDynamoDBConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.DynamoDBConfig resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $TableName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceElasticsearchConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceElasticsearchConfig.ps1
index 034393f5c..994e6b19a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceElasticsearchConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceElasticsearchConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceElasticsearchConfig {
+function Add-VSAppSyncDataSourceElasticsearchConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.ElasticsearchConfig resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AwsRegion,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceHttpConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceHttpConfig.ps1
index e46c4bfe7..902402751 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceHttpConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceHttpConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceHttpConfig {
+function Add-VSAppSyncDataSourceHttpConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.HttpConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceLambdaConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceLambdaConfig.ps1
index df664e254..18f0b6f98 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceLambdaConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceLambdaConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceLambdaConfig {
+function Add-VSAppSyncDataSourceLambdaConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.LambdaConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiLogConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiLogConfig.ps1
index 7cf14079d..d95a68798 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiLogConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiLogConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncGraphQLApiLogConfig {
+function Add-VSAppSyncGraphQLApiLogConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLApi.LogConfig resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $CloudWatchLogsRoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiOpenIDConnectConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiOpenIDConnectConfig.ps1
index 8a473117a..06359f55c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiOpenIDConnectConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiOpenIDConnectConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncGraphQLApiOpenIDConnectConfig {
+function Add-VSAppSyncGraphQLApiOpenIDConnectConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLApi.OpenIDConnectConfig resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $Issuer,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiUserPoolConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiUserPoolConfig.ps1
index e3b8289a6..ff6511cdc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiUserPoolConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiUserPoolConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAppSyncGraphQLApiUserPoolConfig {
+function Add-VSAppSyncGraphQLApiUserPoolConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLApi.UserPoolConfig resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $AppIdClientRegex,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $UserPoolId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $AwsRegion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScalableTargetAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScalableTargetAction.ps1
index 60a6a1300..b4960873c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScalableTargetAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScalableTargetAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalableTargetScalableTargetAction {
+function Add-VSApplicationAutoScalingScalableTargetScalableTargetAction {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScheduledAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScheduledAction.ps1
index d6c850c1f..414ae4cd8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScheduledAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalableTargetScheduledAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalableTargetScheduledAction {
+function Add-VSApplicationAutoScalingScalableTargetScheduledAction {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction resource property to the template
@@ -52,7 +52,7 @@
         $ScalableTargetAction,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -63,7 +63,7 @@
         $Schedule,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification.ps1
index b8433f87e..71bd218a2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification {
+function Add-VSApplicationAutoScalingScalingPolicyCustomizedMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification resource property to the template
@@ -61,7 +61,7 @@
         $Dimensions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -72,7 +72,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $Namespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -94,7 +94,7 @@
         $Statistic,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyMetricDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyMetricDimension.ps1
index a10fcf911..0e62e282d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyMetricDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyMetricDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyMetricDimension {
+function Add-VSApplicationAutoScalingScalingPolicyMetricDimension {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification.ps1
index 05a6cbd04..d15749f87 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification {
+function Add-VSApplicationAutoScalingScalingPolicyPredefinedMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $PredefinedMetricType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepAdjustment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepAdjustment.ps1
index b311c9023..c076f262b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepAdjustment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepAdjustment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyStepAdjustment {
+function Add-VSApplicationAutoScalingScalingPolicyStepAdjustment {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration.ps1
index 9c2926ccf..c4b28a133 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration {
+function Add-VSApplicationAutoScalingScalingPolicyStepScalingPolicyConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration resource property to the template
@@ -50,7 +50,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $Cooldown,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration.ps1
index 17201a08a..8ee47b323 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration {
+function Add-VSApplicationAutoScalingScalingPolicyTargetTrackingScalingPolicyConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification.ps1
index 83d639ddd..9f0cdc06f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification {
+function Add-VSAutoScalingAutoScalingGroupLifecycleHookSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $HeartbeatTimeout,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -85,7 +85,7 @@
         $LifecycleHookName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $LifecycleTransition,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $NotificationMetadata,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $NotificationTargetARN,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupMetricsCollection.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupMetricsCollection.ps1
index a728ba83e..71a3ca0d0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupMetricsCollection.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupMetricsCollection.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingAutoScalingGroupMetricsCollection {
+function Add-VSAutoScalingAutoScalingGroupMetricsCollection {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::AutoScalingGroup.MetricsCollection resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupNotificationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupNotificationConfiguration.ps1
index 80cdf57b4..e959225d1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupNotificationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupNotificationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingAutoScalingGroupNotificationConfiguration {
+function Add-VSAutoScalingAutoScalingGroupNotificationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration resource property to the template
@@ -34,7 +34,7 @@
         $NotificationTypes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupTagProperty.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupTagProperty.ps1
index d4dac6d7e..b580d8818 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupTagProperty.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingAutoScalingGroupTagProperty.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingAutoScalingGroupTagProperty {
+function Add-VSAutoScalingAutoScalingGroupTagProperty {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::AutoScalingGroup.TagProperty resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $PropagateAtLaunch,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDevice.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDevice.ps1
index 910aebc72..61cfeb46c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDevice.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDevice.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingLaunchConfigurationBlockDevice {
+function Add-VSAutoScalingLaunchConfigurationBlockDevice {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::LaunchConfiguration.BlockDevice resource property to the template
@@ -63,7 +63,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $VolumeSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping.ps1
index 0fa5db2f2..467c46616 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping {
+function Add-VSAutoScalingLaunchConfigurationBlockDeviceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $NoDevice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanApplicationSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanApplicationSource.ps1
index 2a003283f..c7ebd9a26 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanApplicationSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanApplicationSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanApplicationSource {
+function Add-VSAutoScalingPlansScalingPlanApplicationSource {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.ApplicationSource resource property to the template
@@ -31,7 +31,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification.ps1
index b52b029a4..d4d84e616 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification {
+function Add-VSAutoScalingPlansScalingPlanCustomizedScalingMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification resource property to the template
@@ -49,7 +49,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -60,7 +60,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -82,7 +82,7 @@
         $Dimensions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $Unit,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanMetricDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanMetricDimension.ps1
index 85d157bb1..60e3bd654 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanMetricDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanMetricDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanMetricDimension {
+function Add-VSAutoScalingPlansScalingPlanMetricDimension {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.MetricDimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Value,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification.ps1
index faa927887..4347caf31 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification {
+function Add-VSAutoScalingPlansScalingPlanPredefinedScalingMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceLabel,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanScalingInstruction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanScalingInstruction.ps1
index c7e97c201..099f6e058 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanScalingInstruction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanScalingInstruction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanScalingInstruction {
+function Add-VSAutoScalingPlansScalingPlanScalingInstruction {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction resource property to the template
@@ -55,7 +55,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -66,7 +66,7 @@
         $ResourceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $ServiceNamespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTagFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTagFilter.ps1
index 6489d0b8b..0263051b5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTagFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTagFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanTagFilter {
+function Add-VSAutoScalingPlansScalingPlanTagFilter {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.TagFilter resource property to the template
@@ -33,7 +33,7 @@
         $Values,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration.ps1
index 82a460460..3dc3a2ce9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration {
+function Add-VSAutoScalingPlansScalingPlanTargetTrackingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification.ps1
index bb8eb1776..90e509663 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification {
+function Add-VSAutoScalingScalingPolicyCustomizedMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification resource property to the template
@@ -61,7 +61,7 @@
         $Dimensions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -72,7 +72,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $Namespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -94,7 +94,7 @@
         $Statistic,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyMetricDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyMetricDimension.ps1
index 3aecbe40d..a0034351d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyMetricDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyMetricDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingScalingPolicyMetricDimension {
+function Add-VSAutoScalingScalingPolicyMetricDimension {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy.MetricDimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification.ps1
index 7826daf97..4c8591cca 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification {
+function Add-VSAutoScalingScalingPolicyPredefinedMetricSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $PredefinedMetricType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyStepAdjustment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyStepAdjustment.ps1
index 40222694b..af5d0a674 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyStepAdjustment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyStepAdjustment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingScalingPolicyStepAdjustment {
+function Add-VSAutoScalingScalingPolicyStepAdjustment {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy.StepAdjustment resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration.ps1
index 31a6451a3..b83e44b36 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration {
+function Add-VSAutoScalingScalingPolicyTargetTrackingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchComputeEnvironmentComputeResources.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchComputeEnvironmentComputeResources.ps1
index 3ed3702af..d77b7d4fc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchComputeEnvironmentComputeResources.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchComputeEnvironmentComputeResources.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchComputeEnvironmentComputeResources {
+function Add-VSBatchComputeEnvironmentComputeResources {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::ComputeEnvironment.ComputeResources resource property to the template
@@ -99,7 +99,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $Subnets,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $MinvCpus,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $ImageId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $InstanceTypes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionContainerProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionContainerProperties.ps1
index 67f6cd75c..161c9e2de 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionContainerProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionContainerProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionContainerProperties {
+function Add-VSBatchJobDefinitionContainerProperties {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.ContainerProperties resource property to the template
@@ -106,7 +106,7 @@
         $MountPoints,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -147,7 +147,7 @@
         $Environment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -175,7 +175,7 @@
         $Vcpus,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionEnvironment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionEnvironment.ps1
index 67605c2da..367d9b347 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionEnvironment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionEnvironment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionEnvironment {
+function Add-VSBatchJobDefinitionEnvironment {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.Environment resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Value,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionMountPoints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionMountPoints.ps1
index f91712169..5908ca9cf 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionMountPoints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionMountPoints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionMountPoints {
+function Add-VSBatchJobDefinitionMountPoints {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.MountPoints resource property to the template
@@ -39,7 +39,7 @@
         $ReadOnly,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $SourceVolume,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionRetryStrategy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionRetryStrategy.ps1
index 207fe1777..3689757bd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionRetryStrategy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionRetryStrategy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionRetryStrategy {
+function Add-VSBatchJobDefinitionRetryStrategy {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.RetryStrategy resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionTimeout.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionTimeout.ps1
index 8b46639dc..fdaabc7b9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionTimeout.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionTimeout.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionTimeout {
+function Add-VSBatchJobDefinitionTimeout {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.Timeout resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionUlimit.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionUlimit.ps1
index afd694e3d..bfcde96ff 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionUlimit.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionUlimit.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionUlimit {
+function Add-VSBatchJobDefinitionUlimit {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.Ulimit resource property to the template
@@ -42,7 +42,7 @@
         $HardLimit,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumes.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumes.ps1
index 0985c8e0d..48db03489 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumes.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumes.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionVolumes {
+function Add-VSBatchJobDefinitionVolumes {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.Volumes resource property to the template
@@ -32,7 +32,7 @@
         $Host,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumesHost.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumesHost.ps1
index 6ff916232..fd34f154f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumesHost.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobDefinitionVolumesHost.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobDefinitionVolumesHost {
+function Add-VSBatchJobDefinitionVolumesHost {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition.VolumesHost resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBatchJobQueueComputeEnvironmentOrder.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBatchJobQueueComputeEnvironmentOrder.ps1
index 5cf82a737..775c317a3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBatchJobQueueComputeEnvironmentOrder.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBatchJobQueueComputeEnvironmentOrder.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBatchJobQueueComputeEnvironmentOrder {
+function Add-VSBatchJobQueueComputeEnvironmentOrder {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobQueue.ComputeEnvironmentOrder resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetBudgetData.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetBudgetData.ps1
index 5e5c7d6db..5b17d6b4f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetBudgetData.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetBudgetData.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetBudgetData {
+function Add-VSBudgetsBudgetBudgetData {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.BudgetData resource property to the template
@@ -64,7 +64,7 @@
         $TimePeriod,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -86,7 +86,7 @@
         $CostFilters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $CostTypes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetCostTypes.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetCostTypes.ps1
index ea7c5ed7d..84f303159 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetCostTypes.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetCostTypes.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetCostTypes {
+function Add-VSBudgetsBudgetCostTypes {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.CostTypes resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotification.ps1
index 9e4521c90..807ee55b6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetNotification {
+function Add-VSBudgetsBudgetNotification {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.Notification resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $ComparisonOperator,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $Threshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotificationWithSubscribers.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotificationWithSubscribers.ps1
index 45ce9c09c..92ca25e91 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotificationWithSubscribers.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetNotificationWithSubscribers.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetNotificationWithSubscribers {
+function Add-VSBudgetsBudgetNotificationWithSubscribers {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.NotificationWithSubscribers resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSpend.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSpend.ps1
index 53e371b41..a50e4d370 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSpend.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSpend.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetSpend {
+function Add-VSBudgetsBudgetSpend {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.Spend resource property to the template
@@ -33,7 +33,7 @@
         $Amount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSubscriber.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSubscriber.ps1
index ef3a8c326..f1c764ede 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSubscriber.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetSubscriber.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetSubscriber {
+function Add-VSBudgetsBudgetSubscriber {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.Subscriber resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $SubscriptionType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetTimePeriod.ps1 b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetTimePeriod.ps1
index c50d90dbf..fb6d907a8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetTimePeriod.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSBudgetsBudgetTimePeriod.ps1	
@@ -1,4 +1,4 @@
-function Add-VSBudgetsBudgetTimePeriod {
+function Add-VSBudgetsBudgetTimePeriod {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget.TimePeriod resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Start,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCertificateManagerCertificateDomainValidationOption.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCertificateManagerCertificateDomainValidationOption.ps1
index 976815dba..d43e3827b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCertificateManagerCertificateDomainValidationOption.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCertificateManagerCertificateDomainValidationOption.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCertificateManagerCertificateDomainValidationOption {
+function Add-VSCertificateManagerCertificateDomainValidationOption {
     <#
     .SYNOPSIS
         Adds an AWS::CertificateManager::Certificate.DomainValidationOption resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $DomainName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloud9EnvironmentEC2Repository.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloud9EnvironmentEC2Repository.ps1
index d1a35ead6..4c8a0d968 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloud9EnvironmentEC2Repository.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloud9EnvironmentEC2Repository.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloud9EnvironmentEC2Repository {
+function Add-VSCloud9EnvironmentEC2Repository {
     <#
     .SYNOPSIS
         Adds an AWS::Cloud9::EnvironmentEC2.Repository resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $PathComponent,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig.ps1
index bddc7dae5..09e67820e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig {
+function Add-VSCloudFrontCloudFrontOriginAccessIdentityCloudFrontOriginAccessIdentityConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCacheBehavior.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCacheBehavior.ps1
index c6b3296df..aebfdf4f4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCacheBehavior.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCacheBehavior.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionCacheBehavior {
+function Add-VSCloudFrontDistributionCacheBehavior {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.CacheBehavior resource property to the template
@@ -120,7 +120,7 @@
         $LambdaFunctionAssociations,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $TargetOriginId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -147,7 +147,7 @@
         $DefaultTTL,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $AllowedMethods,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCookies.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCookies.ps1
index f58f52d56..7646e5676 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCookies.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCookies.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionCookies {
+function Add-VSCloudFrontDistributionCookies {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.Cookies resource property to the template
@@ -33,7 +33,7 @@
         $WhitelistedNames,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomErrorResponse.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomErrorResponse.ps1
index 772464572..5b7bf4872 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomErrorResponse.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomErrorResponse.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionCustomErrorResponse {
+function Add-VSCloudFrontDistributionCustomErrorResponse {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.CustomErrorResponse resource property to the template
@@ -51,7 +51,7 @@
         $ErrorCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomOriginConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomOriginConfig.ps1
index d7d3a612f..4861699ad 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomOriginConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionCustomOriginConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionCustomOriginConfig {
+function Add-VSCloudFrontDistributionCustomOriginConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.CustomOriginConfig resource property to the template
@@ -69,7 +69,7 @@
         $HTTPPort,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDefaultCacheBehavior.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDefaultCacheBehavior.ps1
index 2141fdc0e..a510006a5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDefaultCacheBehavior.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDefaultCacheBehavior.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionDefaultCacheBehavior {
+function Add-VSCloudFrontDistributionDefaultCacheBehavior {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.DefaultCacheBehavior resource property to the template
@@ -114,7 +114,7 @@
         $LambdaFunctionAssociations,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $TargetOriginId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $DefaultTTL,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDistributionConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDistributionConfig.ps1
index c0292f9d1..6124b04fe 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDistributionConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionDistributionConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionDistributionConfig {
+function Add-VSCloudFrontDistributionDistributionConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.DistributionConfig resource property to the template
@@ -114,7 +114,7 @@
         $Logging,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $ViewerCertificate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -181,7 +181,7 @@
         $IPV6Enabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -192,7 +192,7 @@
         $WebACLId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionForwardedValues.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionForwardedValues.ps1
index 5a16b354a..797f1368f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionForwardedValues.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionForwardedValues.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionForwardedValues {
+function Add-VSCloudFrontDistributionForwardedValues {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.ForwardedValues resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionGeoRestriction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionGeoRestriction.ps1
index 6fdceb340..db4ea8e58 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionGeoRestriction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionGeoRestriction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionGeoRestriction {
+function Add-VSCloudFrontDistributionGeoRestriction {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.GeoRestriction resource property to the template
@@ -33,7 +33,7 @@
         $Locations,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLambdaFunctionAssociation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLambdaFunctionAssociation.ps1
index ed4f8e1bb..9d3a496fc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLambdaFunctionAssociation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLambdaFunctionAssociation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionLambdaFunctionAssociation {
+function Add-VSCloudFrontDistributionLambdaFunctionAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.LambdaFunctionAssociation resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $EventType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLogging.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLogging.ps1
index 637dfad8b..51ce4e8a6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLogging.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionLogging.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionLogging {
+function Add-VSCloudFrontDistributionLogging {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.Logging resource property to the template
@@ -39,7 +39,7 @@
         $IncludeCookies,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $Bucket,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOrigin.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOrigin.ps1
index 2345c7cdb..7ecd69595 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOrigin.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOrigin.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionOrigin {
+function Add-VSCloudFrontDistributionOrigin {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.Origin resource property to the template
@@ -66,7 +66,7 @@
         $OriginCustomHeaders,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -79,7 +79,7 @@
         $S3OriginConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $OriginPath,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOriginCustomHeader.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOriginCustomHeader.ps1
index 8f102f191..b93165837 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOriginCustomHeader.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionOriginCustomHeader.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionOriginCustomHeader {
+function Add-VSCloudFrontDistributionOriginCustomHeader {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.OriginCustomHeader resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $HeaderValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionRestrictions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionRestrictions.ps1
index 0b7af929f..20590263c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionRestrictions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionRestrictions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionRestrictions {
+function Add-VSCloudFrontDistributionRestrictions {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.Restrictions resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionS3OriginConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionS3OriginConfig.ps1
index 155a2fd31..81b50b633 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionS3OriginConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionS3OriginConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionS3OriginConfig {
+function Add-VSCloudFrontDistributionS3OriginConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.S3OriginConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionViewerCertificate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionViewerCertificate.ps1
index 81d1f9cc0..48ceda1d5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionViewerCertificate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontDistributionViewerCertificate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontDistributionViewerCertificate {
+function Add-VSCloudFrontDistributionViewerCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution.ViewerCertificate resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $IamCertificateId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $SslSupportMethod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $CloudFrontDefaultCertificate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionLogging.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionLogging.ps1
index 2d6384c77..85f72627e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionLogging.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionLogging.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontStreamingDistributionLogging {
+function Add-VSCloudFrontStreamingDistributionLogging {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::StreamingDistribution.Logging resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $Enabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionS3Origin.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionS3Origin.ps1
index 4caac5bc0..552acfa90 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionS3Origin.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionS3Origin.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontStreamingDistributionS3Origin {
+function Add-VSCloudFrontStreamingDistributionS3Origin {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::StreamingDistribution.S3Origin resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $DomainName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig.ps1
index 0674eaea9..741055db8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig {
+function Add-VSCloudFrontStreamingDistributionStreamingDistributionConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig resource property to the template
@@ -63,7 +63,7 @@
         $Logging,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionTrustedSigners.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionTrustedSigners.ps1
index 72004d92e..c8d846793 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionTrustedSigners.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudFrontStreamingDistributionTrustedSigners.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudFrontStreamingDistributionTrustedSigners {
+function Add-VSCloudFrontStreamingDistributionTrustedSigners {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::StreamingDistribution.TrustedSigners resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailDataResource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailDataResource.ps1
index 5503a4b86..19066ba7c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailDataResource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailDataResource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudTrailTrailDataResource {
+function Add-VSCloudTrailTrailDataResource {
     <#
     .SYNOPSIS
         Adds an AWS::CloudTrail::Trail.DataResource resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailEventSelector.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailEventSelector.ps1
index f2148c762..7c32615ca 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailEventSelector.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudTrailTrailEventSelector.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudTrailTrailEventSelector {
+function Add-VSCloudTrailTrailEventSelector {
     <#
     .SYNOPSIS
         Adds an AWS::CloudTrail::Trail.EventSelector resource property to the template
@@ -52,7 +52,7 @@
         $IncludeManagementEvents,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCloudWatchAlarmDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCloudWatchAlarmDimension.ps1
index 5f3e8aba2..0267cbe10 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCloudWatchAlarmDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCloudWatchAlarmDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCloudWatchAlarmDimension {
+function Add-VSCloudWatchAlarmDimension {
     <#
     .SYNOPSIS
         Adds an AWS::CloudWatch::Alarm.Dimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectArtifacts.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectArtifacts.ps1
index 35a1cf6b3..3bffdd97c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectArtifacts.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectArtifacts.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectArtifacts {
+function Add-VSCodeBuildProjectArtifacts {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.Artifacts resource property to the template
@@ -66,7 +66,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $Path,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $OverrideArtifactName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $EncryptionDisabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $Location,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironment.ps1
index 055007ca4..831672ffa 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectEnvironment {
+function Add-VSCodeBuildProjectEnvironment {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.Environment resource property to the template
@@ -55,7 +55,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -80,7 +80,7 @@
         $PrivilegedMode,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $Image,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $ComputeType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironmentVariable.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironmentVariable.ps1
index 9e3c49890..25600f8ce 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironmentVariable.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectEnvironmentVariable.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectEnvironmentVariable {
+function Add-VSCodeBuildProjectEnvironmentVariable {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.EnvironmentVariable resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Value,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectCache.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectCache.ps1
index 8f0ae498d..bc83cbf4c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectCache.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectCache.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectProjectCache {
+function Add-VSCodeBuildProjectProjectCache {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.ProjectCache resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectTriggers.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectTriggers.ps1
index 2482c6b4c..09709d35f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectTriggers.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectProjectTriggers.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectProjectTriggers {
+function Add-VSCodeBuildProjectProjectTriggers {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.ProjectTriggers resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSource.ps1
index 1ce57586c..a4c8a54ea 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectSource {
+function Add-VSCodeBuildProjectSource {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.Source resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -76,7 +76,7 @@
         $Auth,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $InsecureSsl,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSourceAuth.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSourceAuth.ps1
index 1cd4188ac..0ac3908ca 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSourceAuth.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectSourceAuth.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectSourceAuth {
+function Add-VSCodeBuildProjectSourceAuth {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.SourceAuth resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectVpcConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectVpcConfig.ps1
index 1f4ca2084..12aa42de1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectVpcConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeBuildProjectVpcConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeBuildProjectVpcConfig {
+function Add-VSCodeBuildProjectVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project.VpcConfig resource property to the template
@@ -40,7 +40,7 @@
         $Subnets,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeCommitRepositoryRepositoryTrigger.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeCommitRepositoryRepositoryTrigger.ps1
index c79784709..91a2c93b8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeCommitRepositoryRepositoryTrigger.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeCommitRepositoryRepositoryTrigger.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeCommitRepositoryRepositoryTrigger {
+function Add-VSCodeCommitRepositoryRepositoryTrigger {
     <#
     .SYNOPSIS
         Adds an AWS::CodeCommit::Repository.RepositoryTrigger resource property to the template
@@ -54,7 +54,7 @@
         $Branches,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -65,7 +65,7 @@
         $CustomData,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -76,7 +76,7 @@
         $DestinationArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts.ps1
index e892a4655..5d87a3679 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts {
+function Add-VSCodeDeployDeploymentConfigMinimumHealthyHosts {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarm.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarm.ps1
index 7efe69793..dc9f1f663 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarm.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarm.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupAlarm {
+function Add-VSCodeDeployDeploymentGroupAlarm {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.Alarm resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarmConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarmConfiguration.ps1
index 841d74006..189870c0c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarmConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAlarmConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupAlarmConfiguration {
+function Add-VSCodeDeployDeploymentGroupAlarmConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration.ps1
index b8ba21967..7588595a0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration {
+function Add-VSCodeDeployDeploymentGroupAutoRollbackConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeployment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeployment.ps1
index a79bbf891..6597314ee 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeployment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeployment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupDeployment {
+function Add-VSCodeDeployDeploymentGroupDeployment {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.Deployment resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeploymentStyle.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeploymentStyle.ps1
index 180a46835..dc77938cd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeploymentStyle.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupDeploymentStyle.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupDeploymentStyle {
+function Add-VSCodeDeployDeploymentGroupDeploymentStyle {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.DeploymentStyle resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $DeploymentOption,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupEC2TagFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupEC2TagFilter.ps1
index 84866dec7..24e5dda52 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupEC2TagFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupEC2TagFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupEC2TagFilter {
+function Add-VSCodeDeployDeploymentGroupEC2TagFilter {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.EC2TagFilter resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupELBInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupELBInfo.ps1
index b143e0095..f061cce43 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupELBInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupELBInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupELBInfo {
+function Add-VSCodeDeployDeploymentGroupELBInfo {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.ELBInfo resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupGitHubLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupGitHubLocation.ps1
index 7a7754be1..92e9781df 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupGitHubLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupGitHubLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupGitHubLocation {
+function Add-VSCodeDeployDeploymentGroupGitHubLocation {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.GitHubLocation resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $CommitId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupLoadBalancerInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupLoadBalancerInfo.ps1
index 108517f0b..f65a907b5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupLoadBalancerInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupLoadBalancerInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupLoadBalancerInfo {
+function Add-VSCodeDeployDeploymentGroupLoadBalancerInfo {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupRevisionLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupRevisionLocation.ps1
index d99fd1789..d2be173d2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupRevisionLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupRevisionLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupRevisionLocation {
+function Add-VSCodeDeployDeploymentGroupRevisionLocation {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.RevisionLocation resource property to the template
@@ -38,7 +38,7 @@
         $GitHubLocation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupS3Location.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupS3Location.ps1
index de8f6edca..f4acde91d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupS3Location.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupS3Location.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupS3Location {
+function Add-VSCodeDeployDeploymentGroupS3Location {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.S3Location resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $Bucket,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $BundleType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $ETag,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTagFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTagFilter.ps1
index aedf12d66..c15275a0a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTagFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTagFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupTagFilter {
+function Add-VSCodeDeployDeploymentGroupTagFilter {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.TagFilter resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTargetGroupInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTargetGroupInfo.ps1
index dbfce16e3..b1cdeb627 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTargetGroupInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTargetGroupInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupTargetGroupInfo {
+function Add-VSCodeDeployDeploymentGroupTargetGroupInfo {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTriggerConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTriggerConfig.ps1
index 0c4b4a63e..976ff8de4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTriggerConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodeDeployDeploymentGroupTriggerConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodeDeployDeploymentGroupTriggerConfig {
+function Add-VSCodeDeployDeploymentGroupTriggerConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup.TriggerConfig resource property to the template
@@ -40,7 +40,7 @@
         $TriggerEvents,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -51,7 +51,7 @@
         $TriggerName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeArtifactDetails.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeArtifactDetails.ps1
index dee2c19c0..db8030008 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeArtifactDetails.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeArtifactDetails.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelineCustomActionTypeArtifactDetails {
+function Add-VSCodePipelineCustomActionTypeArtifactDetails {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::CustomActionType.ArtifactDetails resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeConfigurationProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeConfigurationProperties.ps1
index 706ee2aee..bf115e1b0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeConfigurationProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeConfigurationProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelineCustomActionTypeConfigurationProperties {
+function Add-VSCodePipelineCustomActionTypeConfigurationProperties {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::CustomActionType.ConfigurationProperties resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -94,7 +94,7 @@
         $Secret,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeSettings.ps1
index bcce8575f..eaafddc35 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineCustomActionTypeSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelineCustomActionTypeSettings {
+function Add-VSCodePipelineCustomActionTypeSettings {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::CustomActionType.Settings resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $EntityUrlTemplate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $ExecutionUrlTemplate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $RevisionUrlTemplate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionDeclaration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionDeclaration.ps1
index d7083cdbe..e946a818a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionDeclaration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionDeclaration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineActionDeclaration {
+function Add-VSCodePipelinePipelineActionDeclaration {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.ActionDeclaration resource property to the template
@@ -88,7 +88,7 @@
         $InputArtifacts,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $OutputArtifacts,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionTypeId.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionTypeId.ps1
index ae86988b1..8d5b6a773 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionTypeId.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineActionTypeId.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineActionTypeId {
+function Add-VSCodePipelinePipelineActionTypeId {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.ActionTypeId resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $Category,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $Owner,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Provider,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineArtifactStore.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineArtifactStore.ps1
index 220f239e8..4e81af8f3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineArtifactStore.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineArtifactStore.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineArtifactStore {
+function Add-VSCodePipelinePipelineArtifactStore {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.ArtifactStore resource property to the template
@@ -38,7 +38,7 @@
         $EncryptionKey,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $Location,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineBlockerDeclaration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineBlockerDeclaration.ps1
index f1f7ae029..600dcf234 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineBlockerDeclaration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineBlockerDeclaration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineBlockerDeclaration {
+function Add-VSCodePipelinePipelineBlockerDeclaration {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.BlockerDeclaration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineEncryptionKey.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineEncryptionKey.ps1
index 5acd6f6ac..19bcd108f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineEncryptionKey.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineEncryptionKey.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineEncryptionKey {
+function Add-VSCodePipelinePipelineEncryptionKey {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.EncryptionKey resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineInputArtifact.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineInputArtifact.ps1
index 82608e5d4..f3e0d78e5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineInputArtifact.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineInputArtifact.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineInputArtifact {
+function Add-VSCodePipelinePipelineInputArtifact {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.InputArtifact resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineOutputArtifact.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineOutputArtifact.ps1
index 9ec75b4d0..888909810 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineOutputArtifact.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineOutputArtifact.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineOutputArtifact {
+function Add-VSCodePipelinePipelineOutputArtifact {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.OutputArtifact resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageDeclaration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageDeclaration.ps1
index 36b46302a..e76c7747d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageDeclaration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageDeclaration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineStageDeclaration {
+function Add-VSCodePipelinePipelineStageDeclaration {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.StageDeclaration resource property to the template
@@ -62,7 +62,7 @@
         $Blockers,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageTransition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageTransition.ps1
index aa4db3131..a3467a38c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageTransition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelinePipelineStageTransition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelinePipelineStageTransition {
+function Add-VSCodePipelinePipelineStageTransition {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline.StageTransition resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Reason,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookAuthConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookAuthConfiguration.ps1
index 0960b42cd..d2b4195a2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookAuthConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookAuthConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelineWebhookWebhookAuthConfiguration {
+function Add-VSCodePipelineWebhookWebhookAuthConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Webhook.WebhookAuthConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AllowedIPRange,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookFilterRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookFilterRule.ps1
index 1baf19e6f..46c7538d9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookFilterRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCodePipelineWebhookWebhookFilterRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCodePipelineWebhookWebhookFilterRule {
+function Add-VSCodePipelineWebhookWebhookFilterRule {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Webhook.WebhookFilterRule resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $JsonPath,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoIdentityProvider.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoIdentityProvider.ps1
index 6ed1e0009..e3b519b42 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoIdentityProvider.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoIdentityProvider.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolCognitoIdentityProvider {
+function Add-VSCognitoIdentityPoolCognitoIdentityProvider {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPool.CognitoIdentityProvider resource property to the template
@@ -39,7 +39,7 @@
         $ServerSideTokenCheck,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $ProviderName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoStreams.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoStreams.ps1
index 0c7cfe35b..bec8acf38 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoStreams.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolCognitoStreams.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolCognitoStreams {
+function Add-VSCognitoIdentityPoolCognitoStreams {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPool.CognitoStreams resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $StreamingStatus,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $StreamName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolPushSync.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolPushSync.ps1
index 8731d18ff..27cfeb311 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolPushSync.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolPushSync.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolPushSync {
+function Add-VSCognitoIdentityPoolPushSync {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPool.PushSync resource property to the template
@@ -33,7 +33,7 @@
         $ApplicationArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentMappingRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentMappingRule.ps1
index e4bbdb271..b5d223038 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentMappingRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentMappingRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolRoleAttachmentMappingRule {
+function Add-VSCognitoIdentityPoolRoleAttachmentMappingRule {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPoolRoleAttachment.MappingRule resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $MatchType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $Value,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Claim,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping.ps1
index fdc99e950..513f4221b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping {
+function Add-VSCognitoIdentityPoolRoleAttachmentRoleMapping {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType.ps1
index a2d871e66..15d1c2583 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType {
+function Add-VSCognitoIdentityPoolRoleAttachmentRulesConfigurationType {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolAdminCreateUserConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolAdminCreateUserConfig.ps1
index 6128122af..7e80a6f50 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolAdminCreateUserConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolAdminCreateUserConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolAdminCreateUserConfig {
+function Add-VSCognitoUserPoolAdminCreateUserConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.AdminCreateUserConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolDeviceConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolDeviceConfiguration.ps1
index b247c9326..14fadf675 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolDeviceConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolDeviceConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolDeviceConfiguration {
+function Add-VSCognitoUserPoolDeviceConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.DeviceConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolEmailConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolEmailConfiguration.ps1
index bec3b1836..5e448e320 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolEmailConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolEmailConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolEmailConfiguration {
+function Add-VSCognitoUserPoolEmailConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.EmailConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ReplyToEmailAddress,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolInviteMessageTemplate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolInviteMessageTemplate.ps1
index 96fa82eb1..a44cc6b15 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolInviteMessageTemplate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolInviteMessageTemplate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolInviteMessageTemplate {
+function Add-VSCognitoUserPoolInviteMessageTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.InviteMessageTemplate resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $EmailMessage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $SMSMessage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolLambdaConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolLambdaConfig.ps1
index cc0d79803..9a1e0467b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolLambdaConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolLambdaConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolLambdaConfig {
+function Add-VSCognitoUserPoolLambdaConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.LambdaConfig resource property to the template
@@ -66,7 +66,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $CreateAuthChallenge,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -88,7 +88,7 @@
         $PreAuthentication,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $DefineAuthChallenge,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $PreSignUp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -121,7 +121,7 @@
         $PostAuthentication,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -132,7 +132,7 @@
         $PostConfirmation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -143,7 +143,7 @@
         $CustomMessage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolNumberAttributeConstraints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolNumberAttributeConstraints.ps1
index b18790d5a..2dc46fbe9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolNumberAttributeConstraints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolNumberAttributeConstraints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolNumberAttributeConstraints {
+function Add-VSCognitoUserPoolNumberAttributeConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.NumberAttributeConstraints resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $MinValue,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPasswordPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPasswordPolicy.ps1
index 77cb9b1a5..804d4d6a6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPasswordPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPasswordPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolPasswordPolicy {
+function Add-VSCognitoUserPoolPasswordPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.PasswordPolicy resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPolicies.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPolicies.ps1
index 379870678..6f64f6437 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPolicies.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolPolicies.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolPolicies {
+function Add-VSCognitoUserPoolPolicies {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.Policies resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSchemaAttribute.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSchemaAttribute.ps1
index 1f6779a77..24d0afc06 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSchemaAttribute.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSchemaAttribute.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolSchemaAttribute {
+function Add-VSCognitoUserPoolSchemaAttribute {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.SchemaAttribute resource property to the template
@@ -66,7 +66,7 @@
         $Mutable,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $NumberAttributeConstraints,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSmsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSmsConfiguration.ps1
index a71b934d9..958ddabdb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSmsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolSmsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolSmsConfiguration {
+function Add-VSCognitoUserPoolSmsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.SmsConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ExternalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolStringAttributeConstraints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolStringAttributeConstraints.ps1
index 7f8bb6f6d..b35d17ec7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolStringAttributeConstraints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolStringAttributeConstraints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolStringAttributeConstraints {
+function Add-VSCognitoUserPoolStringAttributeConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool.StringAttributeConstraints resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $MinLength,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolUserAttributeType.ps1 b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolUserAttributeType.ps1
index 05e48f087..fe9e5daac 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolUserAttributeType.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSCognitoUserPoolUserAttributeType.ps1	
@@ -1,4 +1,4 @@
-function Add-VSCognitoUserPoolUserAttributeType {
+function Add-VSCognitoUserPoolUserAttributeType {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPoolUser.AttributeType resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Value,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleScope.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleScope.ps1
index 61ec2836e..14e31c310 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleScope.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleScope.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigRuleScope {
+function Add-VSConfigConfigRuleScope {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigRule.Scope resource property to the template
@@ -44,7 +44,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -57,7 +57,7 @@
         $ComplianceResourceTypes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -68,7 +68,7 @@
         $TagKey,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSource.ps1
index f295b279e..d85f8975a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigRuleSource {
+function Add-VSConfigConfigRuleSource {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigRule.Source resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -60,7 +60,7 @@
         $SourceDetails,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSourceDetail.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSourceDetail.ps1
index 8b0a41a6c..0c00879bc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSourceDetail.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigRuleSourceDetail.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigRuleSourceDetail {
+function Add-VSConfigConfigRuleSourceDetail {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigRule.SourceDetail resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $EventSource,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $MaximumExecutionFrequency,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorAccountAggregationSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorAccountAggregationSource.ps1
index 173ebe6d7..0bf84b353 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorAccountAggregationSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorAccountAggregationSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigurationAggregatorAccountAggregationSource {
+function Add-VSConfigConfigurationAggregatorAccountAggregationSource {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigurationAggregator.AccountAggregationSource resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorOrganizationAggregationSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorOrganizationAggregationSource.ps1
index 3e755d707..7082f992c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorOrganizationAggregationSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationAggregatorOrganizationAggregationSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigurationAggregatorOrganizationAggregationSource {
+function Add-VSConfigConfigurationAggregatorOrganizationAggregationSource {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigurationAggregator.OrganizationAggregationSource resource property to the template
@@ -42,7 +42,7 @@
         $AwsRegions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationRecorderRecordingGroup.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationRecorderRecordingGroup.ps1
index d1a8aabb8..e3dd404a0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationRecorderRecordingGroup.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigConfigurationRecorderRecordingGroup.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigConfigurationRecorderRecordingGroup {
+function Add-VSConfigConfigurationRecorderRecordingGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigurationRecorder.RecordingGroup resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties.ps1
index bf7285e31..76d0d712d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties {
+function Add-VSConfigDeliveryChannelConfigSnapshotDeliveryProperties {
     <#
     .SYNOPSIS
         Adds an AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDAXClusterSSESpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDAXClusterSSESpecification.ps1
new file mode 100644
index 000000000..9eba22129
--- /dev/null
+++ b/VaporShell/Public/Resource Property Types/Add-VSDAXClusterSSESpecification.ps1	
@@ -0,0 +1,45 @@
+function Add-VSDAXClusterSSESpecification {
+    <#
+    .SYNOPSIS
+        Adds an AWS::DAX::Cluster.SSESpecification resource property to the template
+
+    .DESCRIPTION
+        Adds an AWS::DAX::Cluster.SSESpecification resource property to the template
+
+    .LINK
+        http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html
+
+    .PARAMETER SSEEnabled
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html#cfn-dax-cluster-ssespecification-sseenabled    
+		PrimitiveType: Boolean    
+		UpdateType: Mutable    
+
+    .FUNCTIONALITY
+        Vaporshell
+    #>
+    [OutputType('Vaporshell.Resource.DAX.Cluster.SSESpecification')]
+    [cmdletbinding()]
+    Param
+    (
+        [parameter(Mandatory = $false)]
+        [System.Boolean]
+        $SSEEnabled
+    )
+    Begin {
+        $obj = [PSCustomObject]@{}
+        $commonParams = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
+    }
+    Process {
+        foreach ($key in $PSBoundParameters.Keys | Where-Object {$commonParams -notcontains $_}) {
+            switch ($key) {
+                Default {
+                    $obj | Add-Member -MemberType NoteProperty -Name $key -Value $PSBoundParameters.$key
+                }
+            }
+        }
+    }
+    End {
+        $obj | Add-ObjectDetail -TypeName 'Vaporshell.Resource.DAX.Cluster.SSESpecification'
+    }
+}
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointDynamoDbSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointDynamoDbSettings.ps1
index 9009b9ac5..3c1a4e6c1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointDynamoDbSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointDynamoDbSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDMSEndpointDynamoDbSettings {
+function Add-VSDMSEndpointDynamoDbSettings {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::Endpoint.DynamoDbSettings resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointMongoDbSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointMongoDbSettings.ps1
index 31ce4ef4a..b522d12fb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointMongoDbSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointMongoDbSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDMSEndpointMongoDbSettings {
+function Add-VSDMSEndpointMongoDbSettings {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::Endpoint.MongoDbSettings resource property to the template
@@ -86,7 +86,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -97,7 +97,7 @@
         $AuthSource,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $AuthMechanism,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $Username,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $DocsToInvestigate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -144,7 +144,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -155,7 +155,7 @@
         $ExtractDocId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -166,7 +166,7 @@
         $DatabaseName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -177,7 +177,7 @@
         $AuthType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -188,7 +188,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointS3Settings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointS3Settings.ps1
index 852a5107b..47e5e8eed 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointS3Settings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDMSEndpointS3Settings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDMSEndpointS3Settings {
+function Add-VSDMSEndpointS3Settings {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::Endpoint.S3Settings resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -71,7 +71,7 @@
         $ExternalTableDefinition,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -82,7 +82,7 @@
         $BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $BucketFolder,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -104,7 +104,7 @@
         $CsvRowDelimiter,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -115,7 +115,7 @@
         $CsvDelimiter,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $ServiceAccessRoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineField.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineField.ps1
index 88a05b723..70aba720d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineField.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineField.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelineField {
+function Add-VSDataPipelinePipelineField {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.Field resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $RefValue,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterAttribute.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterAttribute.ps1
index 48f3f9841..07595bb1c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterAttribute.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterAttribute.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelineParameterAttribute {
+function Add-VSDataPipelinePipelineParameterAttribute {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.ParameterAttribute resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterObject.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterObject.ps1
index f2f16ff16..91071bda9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterObject.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterObject.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelineParameterObject {
+function Add-VSDataPipelinePipelineParameterObject {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.ParameterObject resource property to the template
@@ -43,7 +43,7 @@
         $Attributes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterValue.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterValue.ps1
index a2df2dd8f..51a7c788e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterValue.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelineParameterValue.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelineParameterValue {
+function Add-VSDataPipelinePipelineParameterValue {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.ParameterValue resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineObject.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineObject.ps1
index 456ff5352..04d02329f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineObject.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineObject.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelinePipelineObject {
+function Add-VSDataPipelinePipelinePipelineObject {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.PipelineObject resource property to the template
@@ -49,7 +49,7 @@
         $Fields,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -60,7 +60,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineTag.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineTag.ps1
index 9aa5c416e..58e1dcc45 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineTag.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDataPipelinePipelinePipelineTag.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDataPipelinePipelinePipelineTag {
+function Add-VSDataPipelinePipelinePipelineTag {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline.PipelineTag resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceMicrosoftADVpcSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceMicrosoftADVpcSettings.ps1
index 48c678bd2..4a6777df2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceMicrosoftADVpcSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceMicrosoftADVpcSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDirectoryServiceMicrosoftADVpcSettings {
+function Add-VSDirectoryServiceMicrosoftADVpcSettings {
     <#
     .SYNOPSIS
         Adds an AWS::DirectoryService::MicrosoftAD.VpcSettings resource property to the template
@@ -34,7 +34,7 @@
         $SubnetIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceSimpleADVpcSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceSimpleADVpcSettings.ps1
index 4d3de7e86..616695068 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceSimpleADVpcSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDirectoryServiceSimpleADVpcSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDirectoryServiceSimpleADVpcSettings {
+function Add-VSDirectoryServiceSimpleADVpcSettings {
     <#
     .SYNOPSIS
         Adds an AWS::DirectoryService::SimpleAD.VpcSettings resource property to the template
@@ -34,7 +34,7 @@
         $SubnetIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableAttributeDefinition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableAttributeDefinition.ps1
index fb717cca9..e27067da1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableAttributeDefinition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableAttributeDefinition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableAttributeDefinition {
+function Add-VSDynamoDBTableAttributeDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.AttributeDefinition resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AttributeName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableGlobalSecondaryIndex.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableGlobalSecondaryIndex.ps1
index ef3da4a77..a2a20cd79 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableGlobalSecondaryIndex.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableGlobalSecondaryIndex.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableGlobalSecondaryIndex {
+function Add-VSDynamoDBTableGlobalSecondaryIndex {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.GlobalSecondaryIndex resource property to the template
@@ -44,7 +44,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableKeySchema.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableKeySchema.ps1
index 5ac3f4f2c..deed93a72 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableKeySchema.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableKeySchema.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableKeySchema {
+function Add-VSDynamoDBTableKeySchema {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.KeySchema resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AttributeName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableLocalSecondaryIndex.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableLocalSecondaryIndex.ps1
index 3d7a3e646..222c20264 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableLocalSecondaryIndex.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableLocalSecondaryIndex.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableLocalSecondaryIndex {
+function Add-VSDynamoDBTableLocalSecondaryIndex {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.LocalSecondaryIndex resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTablePointInTimeRecoverySpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTablePointInTimeRecoverySpecification.ps1
index 20c2022f6..4fcd18d61 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTablePointInTimeRecoverySpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTablePointInTimeRecoverySpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTablePointInTimeRecoverySpecification {
+function Add-VSDynamoDBTablePointInTimeRecoverySpecification {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.PointInTimeRecoverySpecification resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProjection.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProjection.ps1
index 285d484fc..fa791b73f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProjection.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProjection.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableProjection {
+function Add-VSDynamoDBTableProjection {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.Projection resource property to the template
@@ -34,7 +34,7 @@
         $NonKeyAttributes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProvisionedThroughput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProvisionedThroughput.ps1
index 349085ea9..6c3e5a804 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProvisionedThroughput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableProvisionedThroughput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableProvisionedThroughput {
+function Add-VSDynamoDBTableProvisionedThroughput {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.ProvisionedThroughput resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableSSESpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableSSESpecification.ps1
index 292cc2321..e4c76c0dd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableSSESpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableSSESpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableSSESpecification {
+function Add-VSDynamoDBTableSSESpecification {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.SSESpecification resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableStreamSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableStreamSpecification.ps1
index a3ae8673f..116751541 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableStreamSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableStreamSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableStreamSpecification {
+function Add-VSDynamoDBTableStreamSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.StreamSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableTimeToLiveSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableTimeToLiveSpecification.ps1
index 33e198c61..6fc58e632 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableTimeToLiveSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSDynamoDBTableTimeToLiveSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSDynamoDBTableTimeToLiveSpecification {
+function Add-VSDynamoDBTableTimeToLiveSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table.TimeToLiveSpecification resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceAssociationParameter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceAssociationParameter.ps1
index a364be948..b52395582 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceAssociationParameter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceAssociationParameter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceAssociationParameter {
+function Add-VSEC2InstanceAssociationParameter {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.AssociationParameter resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceBlockDeviceMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceBlockDeviceMapping.ps1
index 346bba228..f562ad802 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceBlockDeviceMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceBlockDeviceMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceBlockDeviceMapping {
+function Add-VSEC2InstanceBlockDeviceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.BlockDeviceMapping resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -57,7 +57,7 @@
         $NoDevice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceCreditSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceCreditSpecification.ps1
index 1500d4aea..e609419d5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceCreditSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceCreditSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceCreditSpecification {
+function Add-VSEC2InstanceCreditSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.CreditSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceEbs.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceEbs.ps1
index e33a6ce1a..a32949679 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceEbs.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceEbs.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceEbs {
+function Add-VSEC2InstanceEbs {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.Ebs resource property to the template
@@ -63,7 +63,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $VolumeSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceElasticGpuSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceElasticGpuSpecification.ps1
index 6dda0dd00..5531e9f02 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceElasticGpuSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceElasticGpuSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceElasticGpuSpecification {
+function Add-VSEC2InstanceElasticGpuSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.ElasticGpuSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceInstanceIpv6Address.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceInstanceIpv6Address.ps1
index 33a1f57a3..5451546f0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceInstanceIpv6Address.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceInstanceIpv6Address.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceInstanceIpv6Address {
+function Add-VSEC2InstanceInstanceIpv6Address {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.InstanceIpv6Address resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceLaunchTemplateSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceLaunchTemplateSpecification.ps1
index c943bd0e0..7777ce2b7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceLaunchTemplateSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceLaunchTemplateSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceLaunchTemplateSpecification {
+function Add-VSEC2InstanceLaunchTemplateSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.LaunchTemplateSpecification resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $LaunchTemplateId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $LaunchTemplateName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNetworkInterface.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNetworkInterface.ps1
index 764399a34..dc97de50e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNetworkInterface.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNetworkInterface.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceNetworkInterface {
+function Add-VSEC2InstanceNetworkInterface {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.NetworkInterface resource property to the template
@@ -102,7 +102,7 @@
         $DeleteOnTermination,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -140,7 +140,7 @@
         $Ipv6Addresses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $NetworkInterfaceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -176,7 +176,7 @@
         $SecondaryPrivateIpAddressCount,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNoDevice.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNoDevice.ps1
index f03ade35c..a6894f227 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNoDevice.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceNoDevice.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceNoDevice {
+function Add-VSEC2InstanceNoDevice {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.NoDevice resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstancePrivateIpAddressSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstancePrivateIpAddressSpecification.ps1
index 1539295f2..f270567b3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstancePrivateIpAddressSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstancePrivateIpAddressSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstancePrivateIpAddressSpecification {
+function Add-VSEC2InstancePrivateIpAddressSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.PrivateIpAddressSpecification resource property to the template
@@ -33,7 +33,7 @@
         $Primary,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceSsmAssociation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceSsmAssociation.ps1
index a2df10a3b..52e245d4f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceSsmAssociation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceSsmAssociation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceSsmAssociation {
+function Add-VSEC2InstanceSsmAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.SsmAssociation resource property to the template
@@ -43,7 +43,7 @@
         $AssociationParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceVolume.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceVolume.ps1
index de87899e1..e8643aea8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceVolume.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2InstanceVolume.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2InstanceVolume {
+function Add-VSEC2InstanceVolume {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance.Volume resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Device,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateBlockDeviceMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateBlockDeviceMapping.ps1
index 534016ded..54f379777 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateBlockDeviceMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateBlockDeviceMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateBlockDeviceMapping {
+function Add-VSEC2LaunchTemplateBlockDeviceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.BlockDeviceMapping resource property to the template
@@ -44,7 +44,7 @@
         $Ebs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $NoDevice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -66,7 +66,7 @@
         $VirtualName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateCreditSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateCreditSpecification.ps1
index 856996019..417a43033 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateCreditSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateCreditSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateCreditSpecification {
+function Add-VSEC2LaunchTemplateCreditSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.CreditSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateEbs.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateEbs.ps1
index ef5aaab9c..ca6b59241 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateEbs.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateEbs.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateEbs {
+function Add-VSEC2LaunchTemplateEbs {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.Ebs resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -71,7 +71,7 @@
         $SnapshotId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -82,7 +82,7 @@
         $VolumeType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateElasticGpuSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateElasticGpuSpecification.ps1
index dd99f9a67..bee9e8489 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateElasticGpuSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateElasticGpuSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateElasticGpuSpecification {
+function Add-VSEC2LaunchTemplateElasticGpuSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.ElasticGpuSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIamInstanceProfile.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIamInstanceProfile.ps1
index f01d8133b..b0f1e53f9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIamInstanceProfile.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIamInstanceProfile.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateIamInstanceProfile {
+function Add-VSEC2LaunchTemplateIamInstanceProfile {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.IamInstanceProfile resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Arn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateInstanceMarketOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateInstanceMarketOptions.ps1
index 94b469b59..a01eaaf04 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateInstanceMarketOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateInstanceMarketOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateInstanceMarketOptions {
+function Add-VSEC2LaunchTemplateInstanceMarketOptions {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.InstanceMarketOptions resource property to the template
@@ -32,7 +32,7 @@
         $SpotOptions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIpv6Add.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIpv6Add.ps1
index fe8d391a7..45a9f0968 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIpv6Add.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateIpv6Add.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateIpv6Add {
+function Add-VSEC2LaunchTemplateIpv6Add {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.Ipv6Add resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateLaunchTemplateData.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateLaunchTemplateData.ps1
index 415baef37..07fc3d187 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateLaunchTemplateData.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateLaunchTemplateData.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateLaunchTemplateData {
+function Add-VSEC2LaunchTemplateLaunchTemplateData {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.LaunchTemplateData resource property to the template
@@ -168,7 +168,7 @@
         $UserData,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -192,7 +192,7 @@
         $IamInstanceProfile,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -208,7 +208,7 @@
         $EbsOptimized,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -248,7 +248,7 @@
         $NetworkInterfaces,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -259,7 +259,7 @@
         $ImageId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -270,7 +270,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateMonitoring.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateMonitoring.ps1
index 561db35d7..49f883751 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateMonitoring.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateMonitoring.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateMonitoring {
+function Add-VSEC2LaunchTemplateMonitoring {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.Monitoring resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateNetworkInterface.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateNetworkInterface.ps1
index 6350f2e72..95b0b0b48 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateNetworkInterface.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateNetworkInterface.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateNetworkInterface {
+function Add-VSEC2LaunchTemplateNetworkInterface {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.NetworkInterface resource property to the template
@@ -93,7 +93,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -104,7 +104,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $DeviceIndex,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +162,7 @@
         $AssociatePublicIpAddress,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePlacement.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePlacement.ps1
index 69cc83f02..2f614218a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePlacement.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePlacement.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplatePlacement {
+function Add-VSEC2LaunchTemplatePlacement {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.Placement resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $GroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $Tenancy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $Affinity,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePrivateIpAdd.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePrivateIpAdd.ps1
index b782db367..7b72efd79 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePrivateIpAdd.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplatePrivateIpAdd.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplatePrivateIpAdd {
+function Add-VSEC2LaunchTemplatePrivateIpAdd {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.PrivateIpAdd resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateSpotOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateSpotOptions.ps1
index 471afef86..4a66b31f3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateSpotOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateSpotOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateSpotOptions {
+function Add-VSEC2LaunchTemplateSpotOptions {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.SpotOptions resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $SpotInstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $InstanceInterruptionBehavior,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateTagSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateTagSpecification.ps1
index 510a262ee..7be1ff5a0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateTagSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2LaunchTemplateTagSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2LaunchTemplateTagSpecification {
+function Add-VSEC2LaunchTemplateTagSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate.TagSpecification resource property to the template
@@ -31,7 +31,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryIcmp.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryIcmp.ps1
index 1a9c14074..6838cb2ac 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryIcmp.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryIcmp.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2NetworkAclEntryIcmp {
+function Add-VSEC2NetworkAclEntryIcmp {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkAclEntry.Icmp resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryPortRange.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryPortRange.ps1
index 37428240e..13aea87d1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryPortRange.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkAclEntryPortRange.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2NetworkAclEntryPortRange {
+function Add-VSEC2NetworkAclEntryPortRange {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkAclEntry.PortRange resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfaceInstanceIpv6Address.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfaceInstanceIpv6Address.ps1
index ce42b31f4..02eaca1b4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfaceInstanceIpv6Address.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfaceInstanceIpv6Address.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2NetworkInterfaceInstanceIpv6Address {
+function Add-VSEC2NetworkInterfaceInstanceIpv6Address {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkInterface.InstanceIpv6Address resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfacePrivateIpAddressSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfacePrivateIpAddressSpecification.ps1
index ebe062ebd..292acb1a1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfacePrivateIpAddressSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2NetworkInterfacePrivateIpAddressSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2NetworkInterfacePrivateIpAddressSpecification {
+function Add-VSEC2NetworkInterfacePrivateIpAddressSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkInterface.PrivateIpAddressSpecification resource property to the template
@@ -33,7 +33,7 @@
         $Primary,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupEgress.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupEgress.ps1
index d055ee71d..b86e5944b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupEgress.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupEgress.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SecurityGroupEgress {
+function Add-VSEC2SecurityGroupEgress {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SecurityGroup.Egress resource property to the template
@@ -66,7 +66,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $CidrIp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -88,7 +88,7 @@
         $CidrIpv6,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $DestinationPrefixListId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $FromPort,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupIngress.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupIngress.ps1
index 780d7f746..745e99814 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SecurityGroupIngress {
+function Add-VSEC2SecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SecurityGroup.Ingress resource property to the template
@@ -72,7 +72,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $CidrIp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -94,7 +94,7 @@
         $CidrIpv6,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $FromPort,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $IpProtocol,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $SourceSecurityGroupId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $SourceSecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetBlockDeviceMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetBlockDeviceMapping.ps1
index ea3e921d4..0d97c3427 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetBlockDeviceMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetBlockDeviceMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetBlockDeviceMapping {
+function Add-VSEC2SpotFleetBlockDeviceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.BlockDeviceMapping resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $Ebs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -66,7 +66,7 @@
         $NoDevice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetEbsBlockDevice.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetEbsBlockDevice.ps1
index 434cde531..c5a21483c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetEbsBlockDevice.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetEbsBlockDevice.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetEbsBlockDevice {
+function Add-VSEC2SpotFleetEbsBlockDevice {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.EbsBlockDevice resource property to the template
@@ -63,7 +63,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $VolumeSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetGroupIdentifier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetGroupIdentifier.ps1
index 70e23b770..507e52163 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetGroupIdentifier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetGroupIdentifier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetGroupIdentifier {
+function Add-VSEC2SpotFleetGroupIdentifier {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.GroupIdentifier resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetIamInstanceProfileSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetIamInstanceProfileSpecification.ps1
index f28dd6d36..9f75ca512 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetIamInstanceProfileSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetIamInstanceProfileSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetIamInstanceProfileSpecification {
+function Add-VSEC2SpotFleetIamInstanceProfileSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.IamInstanceProfileSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceIpv6Address.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceIpv6Address.ps1
index e725a9bf7..6e49fc4f4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceIpv6Address.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceIpv6Address.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetInstanceIpv6Address {
+function Add-VSEC2SpotFleetInstanceIpv6Address {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.InstanceIpv6Address resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification.ps1
index ffd6438b6..7e484c011 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification {
+function Add-VSEC2SpotFleetInstanceNetworkInterfaceSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification resource property to the template
@@ -96,7 +96,7 @@
         $DeleteOnTermination,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $Ipv6Addresses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $SecondaryPrivateIpAddressCount,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetPrivateIpAddressSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetPrivateIpAddressSpecification.ps1
index 8184b1866..4b71e3b9f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetPrivateIpAddressSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetPrivateIpAddressSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetPrivateIpAddressSpecification {
+function Add-VSEC2SpotFleetPrivateIpAddressSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.PrivateIpAddressSpecification resource property to the template
@@ -33,7 +33,7 @@
         $Primary,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetLaunchSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetLaunchSpecification.ps1
index c4aef1286..c7bc57158 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetLaunchSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetLaunchSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetSpotFleetLaunchSpecification {
+function Add-VSEC2SpotFleetSpotFleetLaunchSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.SpotFleetLaunchSpecification resource property to the template
@@ -144,7 +144,7 @@
         $IamInstanceProfile,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -155,7 +155,7 @@
         $ImageId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -166,7 +166,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -177,7 +177,7 @@
         $KernelId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -203,7 +203,7 @@
         $Placement,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -225,7 +225,7 @@
         $SecurityGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -236,7 +236,7 @@
         $SpotPrice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetMonitoring.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetMonitoring.ps1
index 38beb2f97..29d06b7aa 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetMonitoring.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetMonitoring.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetSpotFleetMonitoring {
+function Add-VSEC2SpotFleetSpotFleetMonitoring {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.SpotFleetMonitoring resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetRequestConfigData.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetRequestConfigData.ps1
index 057939ea8..b8463b476 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetRequestConfigData.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetRequestConfigData.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetSpotFleetRequestConfigData {
+function Add-VSEC2SpotFleetSpotFleetRequestConfigData {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.SpotFleetRequestConfigData resource property to the template
@@ -86,7 +86,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -97,7 +97,7 @@
         $AllocationStrategy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $ExcessCapacityTerminationPolicy,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -133,7 +133,7 @@
         $ReplaceUnhealthyInstances,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -150,7 +150,7 @@
         $TerminateInstancesWithExpiration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,7 +172,7 @@
         $ValidFrom,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetTagSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetTagSpecification.ps1
index 649b7697f..2bd512fe1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetTagSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotFleetTagSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetSpotFleetTagSpecification {
+function Add-VSEC2SpotFleetSpotFleetTagSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.SpotFleetTagSpecification resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotPlacement.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotPlacement.ps1
index 6f6c6a159..00503d675 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotPlacement.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2SpotFleetSpotPlacement.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2SpotFleetSpotPlacement {
+function Add-VSEC2SpotFleetSpotPlacement {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet.SpotPlacement resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification.ps1
index e65062c9f..04243832d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification {
+function Add-VSEC2VPNConnectionVpnTunnelOptionsSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $PreSharedKey,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECRRepositoryLifecyclePolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECRRepositoryLifecyclePolicy.ps1
index 5afc10f04..dc0e34932 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECRRepositoryLifecyclePolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECRRepositoryLifecyclePolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECRRepositoryLifecyclePolicy {
+function Add-VSECRRepositoryLifecyclePolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ECR::Repository.LifecyclePolicy resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $LifecyclePolicyText,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServiceAwsVpcConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServiceAwsVpcConfiguration.ps1
index 6205e598c..abac04479 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServiceAwsVpcConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServiceAwsVpcConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServiceAwsVpcConfiguration {
+function Add-VSECSServiceAwsVpcConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.AwsVpcConfiguration resource property to the template
@@ -40,7 +40,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServiceDeploymentConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServiceDeploymentConfiguration.ps1
index b5dd73da5..9886cdcae 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServiceDeploymentConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServiceDeploymentConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServiceDeploymentConfiguration {
+function Add-VSECSServiceDeploymentConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.DeploymentConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServiceLoadBalancer.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServiceLoadBalancer.ps1
index 83d629ea8..0d9e2e673 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServiceLoadBalancer.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServiceLoadBalancer.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServiceLoadBalancer {
+function Add-VSECSServiceLoadBalancer {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.LoadBalancer resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -56,7 +56,7 @@
         $ContainerPort,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $LoadBalancerName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServiceNetworkConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServiceNetworkConfiguration.ps1
index 689e6b89e..fe3741b59 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServiceNetworkConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServiceNetworkConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServiceNetworkConfiguration {
+function Add-VSECSServiceNetworkConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.NetworkConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementConstraint.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementConstraint.ps1
index 8c0f23018..4e25accec 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementConstraint.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementConstraint.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServicePlacementConstraint {
+function Add-VSECSServicePlacementConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.PlacementConstraint resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Expression,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementStrategy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementStrategy.ps1
index 9646b4b4c..eee55150f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementStrategy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServicePlacementStrategy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServicePlacementStrategy {
+function Add-VSECSServicePlacementStrategy {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.PlacementStrategy resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Field,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSServiceServiceRegistry.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSServiceServiceRegistry.ps1
index e19332873..455f48428 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSServiceServiceRegistry.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSServiceServiceRegistry.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSServiceServiceRegistry {
+function Add-VSECSServiceServiceRegistry {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service.ServiceRegistry resource property to the template
@@ -33,7 +33,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionContainerDefinition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionContainerDefinition.ps1
index 66c3b33c5..328752b68 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionContainerDefinition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionContainerDefinition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionContainerDefinition {
+function Add-VSECSTaskDefinitionContainerDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.ContainerDefinition resource property to the template
@@ -258,7 +258,7 @@
         $HealthCheck,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -269,7 +269,7 @@
         $Hostname,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -303,7 +303,7 @@
         $MountPoints,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -342,7 +342,7 @@
         $Ulimits,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -364,7 +364,7 @@
         $VolumesFrom,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionDevice.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionDevice.ps1
index 5bbf9dd8c..21982e033 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionDevice.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionDevice.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionDevice {
+function Add-VSECSTaskDefinitionDevice {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.Device resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $ContainerPath,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHealthCheck.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHealthCheck.ps1
index 280567c45..ea1b4dab8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHealthCheck.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHealthCheck.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionHealthCheck {
+function Add-VSECSTaskDefinitionHealthCheck {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.HealthCheck resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostEntry.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostEntry.ps1
index 23bc1c9cd..60d7c7995 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostEntry.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostEntry.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionHostEntry {
+function Add-VSECSTaskDefinitionHostEntry {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.HostEntry resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Hostname,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostVolumeProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostVolumeProperties.ps1
index 350409cfd..7096c90c0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostVolumeProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionHostVolumeProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionHostVolumeProperties {
+function Add-VSECSTaskDefinitionHostVolumeProperties {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.HostVolumeProperties resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKernelCapabilities.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKernelCapabilities.ps1
index e526324f1..8082228b4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKernelCapabilities.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKernelCapabilities.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionKernelCapabilities {
+function Add-VSECSTaskDefinitionKernelCapabilities {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.KernelCapabilities resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKeyValuePair.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKeyValuePair.ps1
index 0ed27736c..848cc4213 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKeyValuePair.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionKeyValuePair.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionKeyValuePair {
+function Add-VSECSTaskDefinitionKeyValuePair {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.KeyValuePair resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLinuxParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLinuxParameters.ps1
index cc0a2d4d5..aafe47b5e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLinuxParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLinuxParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionLinuxParameters {
+function Add-VSECSTaskDefinitionLinuxParameters {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.LinuxParameters resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLogConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLogConfiguration.ps1
index 38d7c37d0..1ce06d599 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLogConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionLogConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionLogConfiguration {
+function Add-VSECSTaskDefinitionLogConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.LogConfiguration resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionMountPoint.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionMountPoint.ps1
index 0ccfabdc6..652c7f9fc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionMountPoint.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionMountPoint.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionMountPoint {
+function Add-VSECSTaskDefinitionMountPoint {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.MountPoint resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $ReadOnly,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionPortMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionPortMapping.ps1
index f2996dab2..39a0f50e7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionPortMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionPortMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionPortMapping {
+function Add-VSECSTaskDefinitionPortMapping {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.PortMapping resource property to the template
@@ -42,7 +42,7 @@
         $HostPort,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint.ps1
index cc5aafdab..a52134f95 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint {
+function Add-VSECSTaskDefinitionTaskDefinitionPlacementConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Expression,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionUlimit.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionUlimit.ps1
index 4d46f4c10..5e8a2ccd1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionUlimit.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionUlimit.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionUlimit {
+function Add-VSECSTaskDefinitionUlimit {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.Ulimit resource property to the template
@@ -39,7 +39,7 @@
         $HardLimit,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolume.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolume.ps1
index 7453c6410..6b1c70b5a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolume.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolume.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionVolume {
+function Add-VSECSTaskDefinitionVolume {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.Volume resource property to the template
@@ -32,7 +32,7 @@
         $Host,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolumeFrom.ps1 b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolumeFrom.ps1
index ad9642bca..476c761a5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolumeFrom.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSECSTaskDefinitionVolumeFrom.ps1	
@@ -1,4 +1,4 @@
-function Add-VSECSTaskDefinitionVolumeFrom {
+function Add-VSECSTaskDefinitionVolumeFrom {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition.VolumeFrom resource property to the template
@@ -33,7 +33,7 @@
         $ReadOnly,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEFSFileSystemElasticFileSystemTag.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEFSFileSystemElasticFileSystemTag.ps1
index f63ca7470..3dee968ec 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEFSFileSystemElasticFileSystemTag.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEFSFileSystemElasticFileSystemTag.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEFSFileSystemElasticFileSystemTag {
+function Add-VSEFSFileSystemElasticFileSystemTag {
     <#
     .SYNOPSIS
         Adds an AWS::EFS::FileSystem.ElasticFileSystemTag resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEKSClusterResourcesVpcConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEKSClusterResourcesVpcConfig.ps1
index 413165092..033405af5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEKSClusterResourcesVpcConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEKSClusterResourcesVpcConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEKSClusterResourcesVpcConfig {
+function Add-VSEKSClusterResourcesVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EKS::Cluster.ResourcesVpcConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterApplication.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterApplication.ps1
index 2aeca7a26..019cbe4ef 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterApplication.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterApplication.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterApplication {
+function Add-VSEMRClusterApplication {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.Application resource property to the template
@@ -51,7 +51,7 @@
         $Args,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -62,7 +62,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterAutoScalingPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterAutoScalingPolicy.ps1
index e76d9e3bb..8f9908180 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterAutoScalingPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterAutoScalingPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterAutoScalingPolicy {
+function Add-VSEMRClusterAutoScalingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.AutoScalingPolicy resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterBootstrapActionConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterBootstrapActionConfig.ps1
index 2dd2fe046..bc1a989e6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterBootstrapActionConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterBootstrapActionConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterBootstrapActionConfig {
+function Add-VSEMRClusterBootstrapActionConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.BootstrapActionConfig resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterCloudWatchAlarmDefinition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterCloudWatchAlarmDefinition.ps1
index 27c8c34b2..df5ed43b9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterCloudWatchAlarmDefinition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterCloudWatchAlarmDefinition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterCloudWatchAlarmDefinition {
+function Add-VSEMRClusterCloudWatchAlarmDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.CloudWatchAlarmDefinition resource property to the template
@@ -74,7 +74,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $EvaluationPeriods,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $MetricName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $Period,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $Threshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterConfiguration.ps1
index e79ace6d5..5dd270700 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterConfiguration {
+function Add-VSEMRClusterConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.Configuration resource property to the template
@@ -40,7 +40,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsBlockDeviceConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsBlockDeviceConfig.ps1
index bbc24db05..2ded37efd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsBlockDeviceConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsBlockDeviceConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterEbsBlockDeviceConfig {
+function Add-VSEMRClusterEbsBlockDeviceConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.EbsBlockDeviceConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsConfiguration.ps1
index 38f58a30c..96322acdd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterEbsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterEbsConfiguration {
+function Add-VSEMRClusterEbsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.EbsConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetConfig.ps1
index b0b8547e0..a2e2a1d9c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterInstanceFleetConfig {
+function Add-VSEMRClusterInstanceFleetConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.InstanceFleetConfig resource property to the template
@@ -63,7 +63,7 @@
         $LaunchSpecifications,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetProvisioningSpecifications.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetProvisioningSpecifications.ps1
index b3315c4e7..36ce56725 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetProvisioningSpecifications.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceFleetProvisioningSpecifications.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterInstanceFleetProvisioningSpecifications {
+function Add-VSEMRClusterInstanceFleetProvisioningSpecifications {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceGroupConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceGroupConfig.ps1
index 06d717ed0..3767b7495 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceGroupConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceGroupConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterInstanceGroupConfig {
+function Add-VSEMRClusterInstanceGroupConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.InstanceGroupConfig resource property to the template
@@ -70,7 +70,7 @@
         $AutoScalingPolicy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -97,7 +97,7 @@
         $InstanceCount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $Market,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceTypeConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceTypeConfig.ps1
index b4f551cb9..5a2e696dd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceTypeConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterInstanceTypeConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterInstanceTypeConfig {
+function Add-VSEMRClusterInstanceTypeConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.InstanceTypeConfig resource property to the template
@@ -56,7 +56,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $EbsConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterJobFlowInstancesConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterJobFlowInstancesConfig.ps1
index 7b01e727e..b8467e28c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterJobFlowInstancesConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterJobFlowInstancesConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterJobFlowInstancesConfig {
+function Add-VSEMRClusterJobFlowInstancesConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.JobFlowInstancesConfig resource property to the template
@@ -114,7 +114,7 @@
         $CoreInstanceGroup,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $Ec2KeyName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $Ec2SubnetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -147,7 +147,7 @@
         $EmrManagedMasterSecurityGroup,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $EmrManagedSlaveSecurityGroup,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -175,7 +175,7 @@
         $Placement,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterKerberosAttributes.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterKerberosAttributes.ps1
new file mode 100644
index 000000000..c90afc070
--- /dev/null
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterKerberosAttributes.ps1	
@@ -0,0 +1,125 @@
+function Add-VSEMRClusterKerberosAttributes {
+    <#
+    .SYNOPSIS
+        Adds an AWS::EMR::Cluster.KerberosAttributes resource property to the template
+
+    .DESCRIPTION
+        Adds an AWS::EMR::Cluster.KerberosAttributes resource property to the template
+
+    .LINK
+        http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html
+
+    .PARAMETER ADDomainJoinPassword
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinpassword    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Mutable    
+
+    .PARAMETER ADDomainJoinUser
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinuser    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Mutable    
+
+    .PARAMETER CrossRealmTrustPrincipalPassword
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-crossrealmtrustprincipalpassword    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Mutable    
+
+    .PARAMETER KdcAdminPassword
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-kdcadminpassword    
+		PrimitiveType: String    
+		Required: True    
+		UpdateType: Mutable    
+
+    .PARAMETER Realm
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-realm    
+		PrimitiveType: String    
+		Required: True    
+		UpdateType: Mutable    
+
+    .FUNCTIONALITY
+        Vaporshell
+    #>
+    [OutputType('Vaporshell.Resource.EMR.Cluster.KerberosAttributes')]
+    [cmdletbinding()]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword","ADDomainJoinPassword")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword","CrossRealmTrustPrincipalPassword")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword","KdcAdminPassword")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingUserNameAndPasswordParams","")]
+    Param
+    (
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $ADDomainJoinPassword,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $ADDomainJoinUser,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $CrossRealmTrustPrincipalPassword,
+        [parameter(Mandatory = $true)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $KdcAdminPassword,
+        [parameter(Mandatory = $true)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $Realm
+    )
+    Begin {
+        $obj = [PSCustomObject]@{}
+        $commonParams = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
+    }
+    Process {
+        foreach ($key in $PSBoundParameters.Keys | Where-Object {$commonParams -notcontains $_}) {
+            switch ($key) {
+                Default {
+                    $obj | Add-Member -MemberType NoteProperty -Name $key -Value $PSBoundParameters.$key
+                }
+            }
+        }
+    }
+    End {
+        $obj | Add-ObjectDetail -TypeName 'Vaporshell.Resource.EMR.Cluster.KerberosAttributes'
+    }
+}
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterMetricDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterMetricDimension.ps1
index c1c85cd7c..e7c06d32f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterMetricDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterMetricDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterMetricDimension {
+function Add-VSEMRClusterMetricDimension {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.MetricDimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterPlacementType.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterPlacementType.ps1
index 79889d2e3..efabe0781 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterPlacementType.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterPlacementType.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterPlacementType {
+function Add-VSEMRClusterPlacementType {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.PlacementType resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingAction.ps1
index 96cb32586..c3b62a5f8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterScalingAction {
+function Add-VSEMRClusterScalingAction {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.ScalingAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingConstraints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingConstraints.ps1
index 42b4e91c2..0a9e2ccf3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingConstraints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingConstraints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterScalingConstraints {
+function Add-VSEMRClusterScalingConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.ScalingConstraints resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingRule.ps1
index 85c44d1e0..3572633e1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterScalingRule {
+function Add-VSEMRClusterScalingRule {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.ScalingRule resource property to the template
@@ -44,7 +44,7 @@
         $Action,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingTrigger.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingTrigger.ps1
index 65cf58c78..f95be8c27 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingTrigger.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScalingTrigger.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterScalingTrigger {
+function Add-VSEMRClusterScalingTrigger {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.ScalingTrigger resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScriptBootstrapActionConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScriptBootstrapActionConfig.ps1
index 5bed48fc2..e58fe592f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScriptBootstrapActionConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterScriptBootstrapActionConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterScriptBootstrapActionConfig {
+function Add-VSEMRClusterScriptBootstrapActionConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.ScriptBootstrapActionConfig resource property to the template
@@ -34,7 +34,7 @@
         $Args,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSimpleScalingPolicyConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSimpleScalingPolicyConfiguration.ps1
index 2fa3af9a0..46623b7b7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSimpleScalingPolicyConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSimpleScalingPolicyConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterSimpleScalingPolicyConfiguration {
+function Add-VSEMRClusterSimpleScalingPolicyConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.SimpleScalingPolicyConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSpotProvisioningSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSpotProvisioningSpecification.ps1
index 98cfbbefb..869eba293 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSpotProvisioningSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterSpotProvisioningSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterSpotProvisioningSpecification {
+function Add-VSEMRClusterSpotProvisioningSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.SpotProvisioningSpecification resource property to the template
@@ -39,7 +39,7 @@
         $BlockDurationMinutes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterVolumeSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterVolumeSpecification.ps1
index 949930b72..d2bca74b7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRClusterVolumeSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRClusterVolumeSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRClusterVolumeSpecification {
+function Add-VSEMRClusterVolumeSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster.VolumeSpecification resource property to the template
@@ -42,7 +42,7 @@
         $SizeInGB,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigConfiguration.ps1
index 93691fe8f..a1a1f1835 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigConfiguration {
+function Add-VSEMRInstanceFleetConfigConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.Configuration resource property to the template
@@ -40,7 +40,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig.ps1
index 58a63385e..b7ab744fc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig {
+function Add-VSEMRInstanceFleetConfigEbsBlockDeviceConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsConfiguration.ps1
index 5332a5566..6f5df1126 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigEbsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigEbsConfiguration {
+function Add-VSEMRInstanceFleetConfigEbsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.EbsConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications.ps1
index 02e39332e..a9bc3f7fb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications {
+function Add-VSEMRInstanceFleetConfigInstanceFleetProvisioningSpecifications {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceTypeConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceTypeConfig.ps1
index 158a7de40..b0935e108 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceTypeConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigInstanceTypeConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigInstanceTypeConfig {
+function Add-VSEMRInstanceFleetConfigInstanceTypeConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.InstanceTypeConfig resource property to the template
@@ -56,7 +56,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $EbsConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification.ps1
index 692859dec..15ca97c7e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification {
+function Add-VSEMRInstanceFleetConfigSpotProvisioningSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification resource property to the template
@@ -39,7 +39,7 @@
         $BlockDurationMinutes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigVolumeSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigVolumeSpecification.ps1
index ebad66709..11ed523bc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigVolumeSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceFleetConfigVolumeSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceFleetConfigVolumeSpecification {
+function Add-VSEMRInstanceFleetConfigVolumeSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig.VolumeSpecification resource property to the template
@@ -42,7 +42,7 @@
         $SizeInGB,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigAutoScalingPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigAutoScalingPolicy.ps1
index 9127e607f..ccb6f74b8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigAutoScalingPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigAutoScalingPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigAutoScalingPolicy {
+function Add-VSEMRInstanceGroupConfigAutoScalingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.AutoScalingPolicy resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition.ps1
index fec2c44dd..f598bf9be 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition {
+function Add-VSEMRInstanceGroupConfigCloudWatchAlarmDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition resource property to the template
@@ -74,7 +74,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $EvaluationPeriods,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $MetricName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $Period,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $Threshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigConfiguration.ps1
index beec01a39..646885c3e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigConfiguration {
+function Add-VSEMRInstanceGroupConfigConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.Configuration resource property to the template
@@ -40,7 +40,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig.ps1
index 2622514bd..fc6b13f97 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig {
+function Add-VSEMRInstanceGroupConfigEbsBlockDeviceConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsConfiguration.ps1
index 49d71aaad..eb5590644 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigEbsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigEbsConfiguration {
+function Add-VSEMRInstanceGroupConfigEbsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.EbsConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigMetricDimension.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigMetricDimension.ps1
index b5e374342..b5a607601 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigMetricDimension.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigMetricDimension.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigMetricDimension {
+function Add-VSEMRInstanceGroupConfigMetricDimension {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.MetricDimension resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingAction.ps1
index 84598e43a..3e45b6ea3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigScalingAction {
+function Add-VSEMRInstanceGroupConfigScalingAction {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.ScalingAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingConstraints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingConstraints.ps1
index a6470c835..bac249d45 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingConstraints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingConstraints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigScalingConstraints {
+function Add-VSEMRInstanceGroupConfigScalingConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.ScalingConstraints resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingRule.ps1
index 86588617d..09403bad9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigScalingRule {
+function Add-VSEMRInstanceGroupConfigScalingRule {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.ScalingRule resource property to the template
@@ -44,7 +44,7 @@
         $Action,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingTrigger.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingTrigger.ps1
index 6b232bbe2..10b8604bb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingTrigger.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigScalingTrigger.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigScalingTrigger {
+function Add-VSEMRInstanceGroupConfigScalingTrigger {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.ScalingTrigger resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration.ps1
index bc6de7962..cee02053a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration {
+function Add-VSEMRInstanceGroupConfigSimpleScalingPolicyConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigVolumeSpecification.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigVolumeSpecification.ps1
index f39d3b9af..60c6eb663 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigVolumeSpecification.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRInstanceGroupConfigVolumeSpecification.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRInstanceGroupConfigVolumeSpecification {
+function Add-VSEMRInstanceGroupConfigVolumeSpecification {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig.VolumeSpecification resource property to the template
@@ -42,7 +42,7 @@
         $SizeInGB,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRStepHadoopJarStepConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRStepHadoopJarStepConfig.ps1
index 0f4331b37..44352acb8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRStepHadoopJarStepConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRStepHadoopJarStepConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRStepHadoopJarStepConfig {
+function Add-VSEMRStepHadoopJarStepConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Step.HadoopJarStepConfig resource property to the template
@@ -48,7 +48,7 @@
         $Args,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $Jar,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEMRStepKeyValue.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEMRStepKeyValue.ps1
index 3cd57f659..d6e4055e2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEMRStepKeyValue.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEMRStepKeyValue.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEMRStepKeyValue {
+function Add-VSEMRStepKeyValue {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Step.KeyValue resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElastiCacheReplicationGroupNodeGroupConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElastiCacheReplicationGroupNodeGroupConfiguration.ps1
index 2c55c1c5f..fed03c9e6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElastiCacheReplicationGroupNodeGroupConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElastiCacheReplicationGroupNodeGroupConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElastiCacheReplicationGroupNodeGroupConfiguration {
+function Add-VSElastiCacheReplicationGroupNodeGroupConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration resource property to the template
@@ -44,7 +44,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -60,7 +60,7 @@
         $ReplicaCount,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig.ps1
index 8177dd8b5..b32a28c75 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig {
+function Add-VSElasticBeanstalkApplicationApplicationResourceLifecycleConfig {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig.ps1
index be2acbd3d..9ceec374f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig {
+function Add-VSElasticBeanstalkApplicationApplicationVersionLifecycleConfig {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxAgeRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxAgeRule.ps1
index 52ab74ad8..67e11c875 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxAgeRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxAgeRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkApplicationMaxAgeRule {
+function Add-VSElasticBeanstalkApplicationMaxAgeRule {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Application.MaxAgeRule resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxCountRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxCountRule.ps1
index b0da0f770..b167935b2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxCountRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationMaxCountRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkApplicationMaxCountRule {
+function Add-VSElasticBeanstalkApplicationMaxCountRule {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Application.MaxCountRule resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationVersionSourceBundle.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationVersionSourceBundle.ps1
index 434bf3d04..97c702019 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationVersionSourceBundle.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkApplicationVersionSourceBundle.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkApplicationVersionSourceBundle {
+function Add-VSElasticBeanstalkApplicationVersionSourceBundle {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $S3Bucket,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.ps1
index 8df4466f1..adb4d5261 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting {
+function Add-VSElasticBeanstalkConfigurationTemplateConfigurationOptionSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $Namespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $OptionName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $ResourceName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration.ps1
index a13936d72..a6d05a648 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration {
+function Add-VSElasticBeanstalkConfigurationTemplateSourceConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ApplicationName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentOptionSetting.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentOptionSetting.ps1
index fb83721e7..353d9602e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentOptionSetting.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentOptionSetting.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkEnvironmentOptionSetting {
+function Add-VSElasticBeanstalkEnvironmentOptionSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Environment.OptionSetting resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $Namespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $OptionName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $ResourceName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentTier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentTier.ps1
index f0a01b21c..0592d76f1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentTier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticBeanstalkEnvironmentTier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticBeanstalkEnvironmentTier {
+function Add-VSElasticBeanstalkEnvironmentTier {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Environment.Tier resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy.ps1
index 00a9710fd..706560311 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy {
+function Add-VSElasticLoadBalancingLoadBalancerAccessLoggingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy resource property to the template
@@ -48,7 +48,7 @@
         $Enabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $S3BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy.ps1
index 76a3e77a9..1ca23d50a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy {
+function Add-VSElasticLoadBalancingLoadBalancerAppCookieStickinessPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $CookieName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy.ps1
index ebe76aea7..ad755fa0a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy {
+function Add-VSElasticLoadBalancingLoadBalancerConnectionDrainingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionSettings.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionSettings.ps1
index 0f168392c..5d359cb84 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionSettings.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerConnectionSettings.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerConnectionSettings {
+function Add-VSElasticLoadBalancingLoadBalancerConnectionSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerHealthCheck.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerHealthCheck.ps1
index 1c58899f0..fad5a45b8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerHealthCheck.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerHealthCheck.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerHealthCheck {
+function Add-VSElasticLoadBalancingLoadBalancerHealthCheck {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $HealthyThreshold,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $Interval,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $Target,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $Timeout,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy.ps1
index 60859b8b6..19a082341 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy {
+function Add-VSElasticLoadBalancingLoadBalancerLBCookieStickinessPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $CookieExpirationPeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerListeners.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerListeners.ps1
index cc990a045..f99ce396d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerListeners.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerListeners.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerListeners {
+function Add-VSElasticLoadBalancingLoadBalancerListeners {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.Listeners resource property to the template
@@ -56,7 +56,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $InstancePort,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -78,7 +78,7 @@
         $InstanceProtocol,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $PolicyNames,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Protocol,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerPolicies.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerPolicies.ps1
index 44e9ab236..cacd9540b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerPolicies.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingLoadBalancerPolicies.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingLoadBalancerPolicies {
+function Add-VSElasticLoadBalancingLoadBalancerPolicies {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer.Policies resource property to the template
@@ -60,7 +60,7 @@
         $LoadBalancerPorts,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -71,7 +71,7 @@
         $PolicyName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerAction.ps1
index 4088568d4..b0ec24fa0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2ListenerAction {
+function Add-VSElasticLoadBalancingV2ListenerAction {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::Listener.Action resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $TargetGroupArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificate.ps1
index 2a90bf61c..d2a236fa4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2ListenerCertificate {
+function Add-VSElasticLoadBalancingV2ListenerCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::Listener.Certificate resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificateCertificate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificateCertificate.ps1
index 8f3a5c05b..ebd9d73aa 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificateCertificate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerCertificateCertificate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2ListenerCertificateCertificate {
+function Add-VSElasticLoadBalancingV2ListenerCertificateCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleAction.ps1
index e22c43e0b..56e973923 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2ListenerRuleAction {
+function Add-VSElasticLoadBalancingV2ListenerRuleAction {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::ListenerRule.Action resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $TargetGroupArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition.ps1
index 4b4cd8348..92a41f04e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition {
+function Add-VSElasticLoadBalancingV2ListenerRuleRuleCondition {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute.ps1
index 5b461230a..13d8a5a13 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute {
+function Add-VSElasticLoadBalancingV2LoadBalancerLoadBalancerAttribute {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping.ps1
index fb21aa326..54c3241ac 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping {
+function Add-VSElasticLoadBalancingV2LoadBalancerSubnetMapping {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $AllocationId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupMatcher.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupMatcher.ps1
index fdf616499..456d8aad8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupMatcher.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupMatcher.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2TargetGroupMatcher {
+function Add-VSElasticLoadBalancingV2TargetGroupMatcher {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::TargetGroup.Matcher resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetDescription.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetDescription.ps1
index 0b7c6a5c6..e77367cf5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetDescription.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetDescription.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2TargetGroupTargetDescription {
+function Add-VSElasticLoadBalancingV2TargetGroupTargetDescription {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute.ps1
index 5fdd1d8fa..484fbdcd3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute {
+function Add-VSElasticLoadBalancingV2TargetGroupTargetGroupAttribute {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEBSOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEBSOptions.ps1
index cb0c5be71..a28f70c91 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEBSOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEBSOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticsearchDomainEBSOptions {
+function Add-VSElasticsearchDomainEBSOptions {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain.EBSOptions resource property to the template
@@ -51,7 +51,7 @@
         $VolumeSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainElasticsearchClusterConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainElasticsearchClusterConfig.ps1
index e0aa51314..acd38b6cd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainElasticsearchClusterConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainElasticsearchClusterConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticsearchDomainElasticsearchClusterConfig {
+function Add-VSElasticsearchDomainElasticsearchClusterConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain.ElasticsearchClusterConfig resource property to the template
@@ -60,7 +60,7 @@
         $DedicatedMasterEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $InstanceCount,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEncryptionAtRestOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEncryptionAtRestOptions.ps1
index 66fc50f11..dff5fab1c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEncryptionAtRestOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainEncryptionAtRestOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticsearchDomainEncryptionAtRestOptions {
+function Add-VSElasticsearchDomainEncryptionAtRestOptions {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain.EncryptionAtRestOptions resource property to the template
@@ -33,7 +33,7 @@
         $Enabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainSnapshotOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainSnapshotOptions.ps1
index 93018da9b..14cfd0618 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainSnapshotOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainSnapshotOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticsearchDomainSnapshotOptions {
+function Add-VSElasticsearchDomainSnapshotOptions {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain.SnapshotOptions resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainVPCOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainVPCOptions.ps1
index 6952bdf17..f1b22be4f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainVPCOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSElasticsearchDomainVPCOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSElasticsearchDomainVPCOptions {
+function Add-VSElasticsearchDomainVPCOptions {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain.VPCOptions resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleEcsParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleEcsParameters.ps1
index 19b82d7b7..e9523e445 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleEcsParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleEcsParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleEcsParameters {
+function Add-VSEventsRuleEcsParameters {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.EcsParameters resource property to the template
@@ -33,7 +33,7 @@
         $TaskCount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleInputTransformer.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleInputTransformer.ps1
index 7cc5413fc..4650bf99a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleInputTransformer.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleInputTransformer.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleInputTransformer {
+function Add-VSEventsRuleInputTransformer {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.InputTransformer resource property to the template
@@ -35,7 +35,7 @@
         $InputPathsMap,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleKinesisParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleKinesisParameters.ps1
index 2c17f0ed6..1d26b23a1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleKinesisParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleKinesisParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleKinesisParameters {
+function Add-VSEventsRuleKinesisParameters {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.KinesisParameters resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandParameters.ps1
index ffe6eecfe..6ab4eaeb5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleRunCommandParameters {
+function Add-VSEventsRuleRunCommandParameters {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.RunCommandParameters resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandTarget.ps1
index 51882d7e6..d74e63fad 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleRunCommandTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleRunCommandTarget {
+function Add-VSEventsRuleRunCommandTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.RunCommandTarget resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleTarget.ps1
index 97cb3f99e..14968ddec 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSEventsRuleTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSEventsRuleTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSEventsRuleTarget {
+function Add-VSEventsRuleTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule.Target resource property to the template
@@ -72,7 +72,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -85,7 +85,7 @@
         $EcsParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Id,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $Input,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $KinesisParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGameLiftAliasRoutingStrategy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGameLiftAliasRoutingStrategy.ps1
index 9963384f2..91b565e15 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGameLiftAliasRoutingStrategy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGameLiftAliasRoutingStrategy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGameLiftAliasRoutingStrategy {
+function Add-VSGameLiftAliasRoutingStrategy {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Alias.RoutingStrategy resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $FleetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Message,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGameLiftBuildS3Location.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGameLiftBuildS3Location.ps1
index 8b5a91ad8..1df0553d2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGameLiftBuildS3Location.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGameLiftBuildS3Location.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGameLiftBuildS3Location {
+function Add-VSGameLiftBuildS3Location {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Build.S3Location resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Bucket,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGameLiftFleetIpPermission.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGameLiftFleetIpPermission.ps1
index be4e18050..921259460 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGameLiftFleetIpPermission.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGameLiftFleetIpPermission.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGameLiftFleetIpPermission {
+function Add-VSGameLiftFleetIpPermission {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Fleet.IpPermission resource property to the template
@@ -45,7 +45,7 @@
         $FromPort,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -56,7 +56,7 @@
         $IpRange,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierGrokClassifier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierGrokClassifier.ps1
index 65ed67274..9c23cc16f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierGrokClassifier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierGrokClassifier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueClassifierGrokClassifier {
+function Add-VSGlueClassifierGrokClassifier {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Classifier.GrokClassifier resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $CustomPatterns,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $GrokPattern,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Classification,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierJsonClassifier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierJsonClassifier.ps1
index d185f2b39..ca4f97184 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierJsonClassifier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierJsonClassifier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueClassifierJsonClassifier {
+function Add-VSGlueClassifierJsonClassifier {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Classifier.JsonClassifier resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $JsonPath,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierXMLClassifier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierXMLClassifier.ps1
index 5f461183f..8587ba367 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierXMLClassifier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueClassifierXMLClassifier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueClassifierXMLClassifier {
+function Add-VSGlueClassifierXMLClassifier {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Classifier.XMLClassifier resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $RowTag,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Classification,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionConnectionInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionConnectionInput.ps1
index def7dc5ba..e89080180 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionConnectionInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionConnectionInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueConnectionConnectionInput {
+function Add-VSGlueConnectionConnectionInput {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Connection.ConnectionInput resource property to the template
@@ -55,7 +55,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -66,7 +66,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $ConnectionProperties,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionPhysicalConnectionRequirements.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionPhysicalConnectionRequirements.ps1
index 650ef526f..87327885a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionPhysicalConnectionRequirements.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueConnectionPhysicalConnectionRequirements.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueConnectionPhysicalConnectionRequirements {
+function Add-VSGlueConnectionPhysicalConnectionRequirements {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Connection.PhysicalConnectionRequirements resource property to the template
@@ -37,7 +37,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $SecurityGroupIdList,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerJdbcTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerJdbcTarget.ps1
index 22a620491..52f48ad9d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerJdbcTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerJdbcTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueCrawlerJdbcTarget {
+function Add-VSGlueCrawlerJdbcTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler.JdbcTarget resource property to the template
@@ -37,7 +37,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -48,7 +48,7 @@
         $ConnectionName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerS3Target.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerS3Target.ps1
index 224ae02f1..f97e8ffc3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerS3Target.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerS3Target.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueCrawlerS3Target {
+function Add-VSGlueCrawlerS3Target {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler.S3Target resource property to the template
@@ -31,7 +31,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchedule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchedule.ps1
index 163819db8..6af1bdcd1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchedule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchedule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueCrawlerSchedule {
+function Add-VSGlueCrawlerSchedule {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler.Schedule resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchemaChangePolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchemaChangePolicy.ps1
index 945211962..04a7f6076 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchemaChangePolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerSchemaChangePolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueCrawlerSchemaChangePolicy {
+function Add-VSGlueCrawlerSchemaChangePolicy {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler.SchemaChangePolicy resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $UpdateBehavior,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerTargets.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerTargets.ps1
index a23ad826d..697f5b5c1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerTargets.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueCrawlerTargets.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueCrawlerTargets {
+function Add-VSGlueCrawlerTargets {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler.Targets resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueDatabaseDatabaseInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueDatabaseDatabaseInput.ps1
index 435cc8ec7..eca535414 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueDatabaseDatabaseInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueDatabaseDatabaseInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueDatabaseDatabaseInput {
+function Add-VSGlueDatabaseDatabaseInput {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Database.DatabaseInput resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $LocationUri,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueJobConnectionsList.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueJobConnectionsList.ps1
index 46aabb100..45cc42e7d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueJobConnectionsList.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueJobConnectionsList.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueJobConnectionsList {
+function Add-VSGlueJobConnectionsList {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Job.ConnectionsList resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueJobExecutionProperty.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueJobExecutionProperty.ps1
index c281a66b0..8e5223cdd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueJobExecutionProperty.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueJobExecutionProperty.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueJobExecutionProperty {
+function Add-VSGlueJobExecutionProperty {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Job.ExecutionProperty resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueJobJobCommand.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueJobJobCommand.ps1
index d4ba8c2e5..32f699332 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueJobJobCommand.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueJobJobCommand.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueJobJobCommand {
+function Add-VSGlueJobJobCommand {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Job.JobCommand resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ScriptLocation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionColumn.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionColumn.ps1
index 67cd785a4..ad6f13524 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionColumn.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionColumn.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionColumn {
+function Add-VSGluePartitionColumn {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.Column resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionOrder.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionOrder.ps1
index e8b942b19..1f02753f8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionOrder.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionOrder.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionOrder {
+function Add-VSGluePartitionOrder {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.Order resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionPartitionInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionPartitionInput.ps1
index e36d9d810..b92d25d48 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionPartitionInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionPartitionInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionPartitionInput {
+function Add-VSGluePartitionPartitionInput {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.PartitionInput resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSerdeInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSerdeInfo.ps1
index d088c2e17..d9840fffe 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSerdeInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSerdeInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionSerdeInfo {
+function Add-VSGluePartitionSerdeInfo {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.SerdeInfo resource property to the template
@@ -47,7 +47,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $SerializationLibrary,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSkewedInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSkewedInfo.ps1
index 5597c0c11..cc428333a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSkewedInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionSkewedInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionSkewedInfo {
+function Add-VSGluePartitionSkewedInfo {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.SkewedInfo resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionStorageDescriptor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionStorageDescriptor.ps1
index 10551e6a7..2d28ad682 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGluePartitionStorageDescriptor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGluePartitionStorageDescriptor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGluePartitionStorageDescriptor {
+function Add-VSGluePartitionStorageDescriptor {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition.StorageDescriptor resource property to the template
@@ -111,7 +111,7 @@
         $SkewedInfo,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $NumberOfBuckets,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $Compressed,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableColumn.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableColumn.ps1
index 2870ec79f..10ee4dacd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableColumn.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableColumn.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableColumn {
+function Add-VSGlueTableColumn {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.Column resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableOrder.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableOrder.ps1
index 76d10ac0b..0ccf535ef 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableOrder.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableOrder.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableOrder {
+function Add-VSGlueTableOrder {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.Order resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableSerdeInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableSerdeInfo.ps1
index 90086de5a..65be29dc6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableSerdeInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableSerdeInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableSerdeInfo {
+function Add-VSGlueTableSerdeInfo {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.SerdeInfo resource property to the template
@@ -47,7 +47,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $SerializationLibrary,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableSkewedInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableSkewedInfo.ps1
index e4dd9d05d..d794f0063 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableSkewedInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableSkewedInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableSkewedInfo {
+function Add-VSGlueTableSkewedInfo {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.SkewedInfo resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableStorageDescriptor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableStorageDescriptor.ps1
index 9b5340113..32f53407f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableStorageDescriptor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableStorageDescriptor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableStorageDescriptor {
+function Add-VSGlueTableStorageDescriptor {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.StorageDescriptor resource property to the template
@@ -111,7 +111,7 @@
         $SkewedInfo,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $NumberOfBuckets,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $Compressed,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTableTableInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTableTableInput.ps1
index 00c2c998e..8ab80ae7c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTableTableInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTableTableInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTableTableInput {
+function Add-VSGlueTableTableInput {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table.TableInput resource property to the template
@@ -79,7 +79,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Owner,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $ViewOriginalText,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -112,7 +112,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $Retention,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerAction.ps1
index 9ed014f68..e232dd4be 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTriggerAction {
+function Add-VSGlueTriggerAction {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Trigger.Action resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerCondition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerCondition.ps1
index de509970b..d0f7c14d1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerCondition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerCondition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTriggerCondition {
+function Add-VSGlueTriggerCondition {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Trigger.Condition resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $State,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $LogicalOperator,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerPredicate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerPredicate.ps1
index 896af30c9..4acc3c118 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerPredicate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGlueTriggerPredicate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGlueTriggerPredicate {
+function Add-VSGlueTriggerPredicate {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Trigger.Predicate resource property to the template
@@ -31,7 +31,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterCondition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterCondition.ps1
index ad67bdd93..0e98d3946 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterCondition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterCondition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGuardDutyFilterCondition {
+function Add-VSGuardDutyFilterCondition {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Filter.Condition resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterFindingCriteria.ps1 b/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterFindingCriteria.ps1
index 6594e9c97..b794e5a88 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterFindingCriteria.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSGuardDutyFilterFindingCriteria.ps1	
@@ -1,4 +1,4 @@
-function Add-VSGuardDutyFilterFindingCriteria {
+function Add-VSGuardDutyFilterFindingCriteria {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Filter.FindingCriteria resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIAMGroupPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIAMGroupPolicy.ps1
index 9a16be7e2..2f2901239 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIAMGroupPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIAMGroupPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIAMGroupPolicy {
+function Add-VSIAMGroupPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::Group.Policy resource property to the template
@@ -41,7 +41,7 @@
         $PolicyDocument,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIAMRolePolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIAMRolePolicy.ps1
index e10930b2c..e24a4c03f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIAMRolePolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIAMRolePolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIAMRolePolicy {
+function Add-VSIAMRolePolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::Role.Policy resource property to the template
@@ -41,7 +41,7 @@
         $PolicyDocument,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIAMUserLoginProfile.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIAMUserLoginProfile.ps1
index ec8c5cf71..b6de752b1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIAMUserLoginProfile.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIAMUserLoginProfile.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIAMUserLoginProfile {
+function Add-VSIAMUserLoginProfile {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::User.LoginProfile resource property to the template
@@ -33,7 +33,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIAMUserPolicy.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIAMUserPolicy.ps1
index 57104017c..8fd22db09 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIAMUserPolicy.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIAMUserPolicy.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIAMUserPolicy {
+function Add-VSIAMUserPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::User.Policy resource property to the template
@@ -41,7 +41,7 @@
         $PolicyDocument,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTThingAttributePayload.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTThingAttributePayload.ps1
index 02fe7e851..2aca5d105 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTThingAttributePayload.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTThingAttributePayload.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTThingAttributePayload {
+function Add-VSIoTThingAttributePayload {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::Thing.AttributePayload resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleAction.ps1
index 79dfbe646..ab23aaa23 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleAction {
+function Add-VSIoTTopicRuleAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.Action resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchAlarmAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchAlarmAction.ps1
index 67f86ca23..a4a4804c2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchAlarmAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchAlarmAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleCloudwatchAlarmAction {
+function Add-VSIoTTopicRuleCloudwatchAlarmAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.CloudwatchAlarmAction resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $AlarmName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $StateReason,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchMetricAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchMetricAction.ps1
index 9cd90692f..4aa07e3f0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchMetricAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleCloudwatchMetricAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleCloudwatchMetricAction {
+function Add-VSIoTTopicRuleCloudwatchMetricAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.CloudwatchMetricAction resource property to the template
@@ -54,7 +54,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -65,7 +65,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -76,7 +76,7 @@
         $MetricNamespace,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -87,7 +87,7 @@
         $MetricTimestamp,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $MetricUnit,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $MetricValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBAction.ps1
index 1e5cd93e3..a70acf5f2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleDynamoDBAction {
+function Add-VSIoTTopicRuleDynamoDBAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.DynamoDBAction resource property to the template
@@ -72,7 +72,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $HashKeyField,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -94,7 +94,7 @@
         $HashKeyType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $HashKeyValue,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $PayloadField,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $RangeKeyField,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $RangeKeyType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $RangeKeyValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBv2Action.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBv2Action.ps1
index 1474157a2..2b18ac473 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBv2Action.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleDynamoDBv2Action.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleDynamoDBv2Action {
+function Add-VSIoTTopicRuleDynamoDBv2Action {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.DynamoDBv2Action resource property to the template
@@ -32,7 +32,7 @@
         $PutItem,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleElasticsearchAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleElasticsearchAction.ps1
index af0ce2e59..7a0b4e89c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleElasticsearchAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleElasticsearchAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleElasticsearchAction {
+function Add-VSIoTTopicRuleElasticsearchAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.ElasticsearchAction resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $Endpoint,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $Index,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleFirehoseAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleFirehoseAction.ps1
index 97be652ad..31d945cd8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleFirehoseAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleFirehoseAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleFirehoseAction {
+function Add-VSIoTTopicRuleFirehoseAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.FirehoseAction resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $DeliveryStreamName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $RoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleKinesisAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleKinesisAction.ps1
index 294c8b4df..8ab47f69a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleKinesisAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleKinesisAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleKinesisAction {
+function Add-VSIoTTopicRuleKinesisAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.KinesisAction resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $PartitionKey,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleLambdaAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleLambdaAction.ps1
index ea1804dba..e6cba9b31 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleLambdaAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleLambdaAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleLambdaAction {
+function Add-VSIoTTopicRuleLambdaAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.LambdaAction resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRulePutItemInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRulePutItemInput.ps1
index a70616cae..936617f3a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRulePutItemInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRulePutItemInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRulePutItemInput {
+function Add-VSIoTTopicRulePutItemInput {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.PutItemInput resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleRepublishAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleRepublishAction.ps1
index e7ef96f3a..5b762897e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleRepublishAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleRepublishAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleRepublishAction {
+function Add-VSIoTTopicRuleRepublishAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.RepublishAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleS3Action.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleS3Action.ps1
index 79efda7e8..21ebce4a2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleS3Action.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleS3Action.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleS3Action {
+function Add-VSIoTTopicRuleS3Action {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.S3Action resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $BucketName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSnsAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSnsAction.ps1
index 7b89bc7b9..f8e288654 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSnsAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSnsAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleSnsAction {
+function Add-VSIoTTopicRuleSnsAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.SnsAction resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $MessageFormat,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSqsAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSqsAction.ps1
index 044187800..d0de48acb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSqsAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleSqsAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleSqsAction {
+function Add-VSIoTTopicRuleSqsAction {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.SqsAction resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $QueueUrl,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleTopicRulePayload.ps1 b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleTopicRulePayload.ps1
index 8435bb7f8..db64953d8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleTopicRulePayload.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSIoTTopicRuleTopicRulePayload.ps1	
@@ -1,4 +1,4 @@
-function Add-VSIoTTopicRuleTopicRulePayload {
+function Add-VSIoTTopicRuleTopicRulePayload {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule.TopicRulePayload resource property to the template
@@ -61,7 +61,7 @@
         $Actions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -72,7 +72,7 @@
         $AwsIotSqlVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -86,7 +86,7 @@
         $RuleDisabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationCSVMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationCSVMappingParameters.ps1
index bd80b5d32..85ef3bcd1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationCSVMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationCSVMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationCSVMappingParameters {
+function Add-VSKinesisAnalyticsApplicationCSVMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.CSVMappingParameters resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $RecordRowDelimiter,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInput.ps1
index 080333953..335cde6bd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationInput {
+function Add-VSKinesisAnalyticsApplicationInput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.Input resource property to the template
@@ -54,7 +54,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputLambdaProcessor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputLambdaProcessor.ps1
index 4eaae1595..61cacf35b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputLambdaProcessor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputLambdaProcessor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationInputLambdaProcessor {
+function Add-VSKinesisAnalyticsApplicationInputLambdaProcessor {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.InputLambdaProcessor resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputParallelism.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputParallelism.ps1
index 19ccab16e..932000da2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputParallelism.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputParallelism.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationInputParallelism {
+function Add-VSKinesisAnalyticsApplicationInputParallelism {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.InputParallelism resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration.ps1
index 5be11cd95..628b6a71c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration {
+function Add-VSKinesisAnalyticsApplicationInputProcessingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.InputProcessingConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputSchema.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputSchema.ps1
index d09586ddd..2d3f2d57c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputSchema.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationInputSchema.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationInputSchema {
+function Add-VSKinesisAnalyticsApplicationInputSchema {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.InputSchema resource property to the template
@@ -37,7 +37,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationJSONMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationJSONMappingParameters.ps1
index cc72ba034..465132e5d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationJSONMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationJSONMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationJSONMappingParameters {
+function Add-VSKinesisAnalyticsApplicationJSONMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.JSONMappingParameters resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput.ps1
index 9f0914618..2a67e869f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput {
+function Add-VSKinesisAnalyticsApplicationKinesisFirehoseInput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.KinesisFirehoseInput resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisStreamsInput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisStreamsInput.ps1
index 47e282443..6743e14b5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisStreamsInput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationKinesisStreamsInput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationKinesisStreamsInput {
+function Add-VSKinesisAnalyticsApplicationKinesisStreamsInput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.KinesisStreamsInput resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationMappingParameters.ps1
index 710040f2b..950b45eec 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationMappingParameters {
+function Add-VSKinesisAnalyticsApplicationMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.MappingParameters resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputDestinationSchema.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputDestinationSchema.ps1
index f2739846a..be4119d7e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputDestinationSchema.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputDestinationSchema.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationOutputDestinationSchema {
+function Add-VSKinesisAnalyticsApplicationOutputDestinationSchema {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput.ps1
index 1fccc5b4c..7ef5818ca 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput {
+function Add-VSKinesisAnalyticsApplicationOutputKinesisFirehoseOutput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput.ps1
index 9c856ddbc..67d1b2254 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput {
+function Add-VSKinesisAnalyticsApplicationOutputKinesisStreamsOutput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputLambdaOutput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputLambdaOutput.ps1
index 7332bf4f8..438f44b89 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputLambdaOutput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputLambdaOutput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationOutputLambdaOutput {
+function Add-VSKinesisAnalyticsApplicationOutputLambdaOutput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ResourceARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputOutput.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputOutput.ps1
index 8dd1de396..6b47233fb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputOutput.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationOutputOutput.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationOutputOutput {
+function Add-VSKinesisAnalyticsApplicationOutputOutput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput.Output resource property to the template
@@ -56,7 +56,7 @@
         $KinesisStreamsOutput,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordColumn.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordColumn.ps1
index 4042c9320..37017846b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordColumn.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordColumn.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationRecordColumn {
+function Add-VSKinesisAnalyticsApplicationRecordColumn {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.RecordColumn resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Mapping,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $SqlType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordFormat.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordFormat.ps1
index 90b5b9b1c..10b624565 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordFormat.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationRecordFormat.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationRecordFormat {
+function Add-VSKinesisAnalyticsApplicationRecordFormat {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application.RecordFormat resource property to the template
@@ -32,7 +32,7 @@
         $MappingParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters.ps1
index 6ded6fbd2..5411c8aab 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceCSVMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $RecordRowDelimiter,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters.ps1
index 642092a0f..0bcdcbe63 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceJSONMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters.ps1
index 976aa0130..5bba110a4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceMappingParameters {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn.ps1
index 800e22e9a..8c2038cae 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordColumn {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Mapping,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $SqlType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat.ps1
index 43d173a7c..901c71cbc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceRecordFormat {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat resource property to the template
@@ -32,7 +32,7 @@
         $MappingParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource.ps1
index 8e14faa6f..da4db3d6a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceDataSource {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource resource property to the template
@@ -38,7 +38,7 @@
         $ReferenceSchema,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema.ps1
index 42ac62c65..2fac4e656 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceReferenceSchema {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema resource property to the template
@@ -37,7 +37,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource.ps1
index 3a32fb8e9..659a2282c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource {
+function Add-VSKinesisAnalyticsApplicationReferenceDataSourceS3ReferenceDataSource {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $BucketARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $FileKey,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamBufferingHints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamBufferingHints.ps1
index 18120f013..433bf0655 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamBufferingHints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamBufferingHints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamBufferingHints {
+function Add-VSKinesisFirehoseDeliveryStreamBufferingHints {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.BufferingHints resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions.ps1
index ea703d338..4ba3e88f7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions {
+function Add-VSKinesisFirehoseDeliveryStreamCloudWatchLoggingOptions {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions resource property to the template
@@ -39,7 +39,7 @@
         $Enabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $LogGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCopyCommand.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCopyCommand.ps1
index 10347b569..f0a245d89 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCopyCommand.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamCopyCommand.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamCopyCommand {
+function Add-VSKinesisFirehoseDeliveryStreamCopyCommand {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.CopyCommand resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $CopyOptions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $DataTableColumns,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints.ps1
index 1c2512019..8b6f4d99e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints {
+function Add-VSKinesisFirehoseDeliveryStreamElasticsearchBufferingHints {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration.ps1
index 058d564f9..186388d49 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamElasticsearchDestinationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration resource property to the template
@@ -88,7 +88,7 @@
         $CloudWatchLoggingOptions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $DomainARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $IndexName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $RetryOptions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $RoleARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $S3Configuration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions.ps1
index a45c5525e..ffe0b599b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions {
+function Add-VSKinesisFirehoseDeliveryStreamElasticsearchRetryOptions {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration.ps1
index 12fd4c81a..d081464ae 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamEncryptionConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration resource property to the template
@@ -32,7 +32,7 @@
         $KMSEncryptionConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration.ps1
index b16100c0a..4d7babc46 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamExtendedS3DestinationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration resource property to the template
@@ -78,7 +78,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $CloudWatchLoggingOptions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -106,7 +106,7 @@
         $EncryptionConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $ProcessingConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -132,7 +132,7 @@
         $S3BackupConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig.ps1
index 3c1cba063..b3381e5aa 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig {
+function Add-VSKinesisFirehoseDeliveryStreamKMSEncryptionConfig {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration.ps1
index 11ef6097b..6158b03ac 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamKinesisStreamSourceConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $KinesisStreamARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration.ps1
index 015e36a30..a52892320 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamProcessingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessor.ps1
index f0fe9b016..ea6c8aa5e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamProcessor {
+function Add-VSKinesisFirehoseDeliveryStreamProcessor {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.Processor resource property to the template
@@ -43,7 +43,7 @@
         $Parameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessorParameter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessorParameter.ps1
index 2fc84b6d4..b55c86c8b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessorParameter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamProcessorParameter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamProcessorParameter {
+function Add-VSKinesisFirehoseDeliveryStreamProcessorParameter {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.ProcessorParameter resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ParameterName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration.ps1
index e64e75913..5ba88aaa9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamRedshiftDestinationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration resource property to the template
@@ -70,7 +70,7 @@
         $CloudWatchLoggingOptions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $CopyCommand,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $ProcessingConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $S3Configuration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration.ps1
index 79e41090b..ae1b92f24 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamS3DestinationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration resource property to the template
@@ -60,7 +60,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $CloudWatchLoggingOptions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -88,7 +88,7 @@
         $EncryptionConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $Prefix,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration.ps1
index 46ec9094b..86c6658f4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration {
+function Add-VSKinesisFirehoseDeliveryStreamSplunkDestinationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration resource property to the template
@@ -77,7 +77,7 @@
         $HECAcknowledgmentTimeoutInSeconds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -88,7 +88,7 @@
         $HECEndpoint,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $HECEndpointType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -114,7 +114,7 @@
         $RetryOptions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions.ps1
index dc0e36271..eb1fa1df3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions {
+function Add-VSKinesisFirehoseDeliveryStreamSplunkRetryOptions {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSKinesisStreamStreamEncryption.ps1 b/VaporShell/Public/Resource Property Types/Add-VSKinesisStreamStreamEncryption.ps1
index faea9fb23..e07ec4c77 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSKinesisStreamStreamEncryption.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSKinesisStreamStreamEncryption.ps1	
@@ -1,4 +1,4 @@
-function Add-VSKinesisStreamStreamEncryption {
+function Add-VSKinesisStreamStreamEncryption {
     <#
     .SYNOPSIS
         Adds an AWS::Kinesis::Stream.StreamEncryption resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $EncryptionType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasAliasRoutingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasAliasRoutingConfiguration.ps1
index 70604bef8..e52560fcf 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasAliasRoutingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasAliasRoutingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaAliasAliasRoutingConfiguration {
+function Add-VSLambdaAliasAliasRoutingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Alias.AliasRoutingConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasVersionWeight.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasVersionWeight.ps1
index 22ee5d6c2..a5744778c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasVersionWeight.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaAliasVersionWeight.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaAliasVersionWeight {
+function Add-VSLambdaAliasVersionWeight {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Alias.VersionWeight resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionCode.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionCode.ps1
index 017e9533a..7124d4fd2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionCode.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionCode.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaFunctionCode {
+function Add-VSLambdaFunctionCode {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function.Code resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $S3Bucket,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $S3Key,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $S3ObjectVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionDeadLetterConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionDeadLetterConfig.ps1
index 4e068fa5a..3578f2626 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionDeadLetterConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionDeadLetterConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaFunctionDeadLetterConfig {
+function Add-VSLambdaFunctionDeadLetterConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function.DeadLetterConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionEnvironment.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionEnvironment.ps1
index 9974dc41e..32a7eec27 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionEnvironment.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionEnvironment.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaFunctionEnvironment {
+function Add-VSLambdaFunctionEnvironment {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function.Environment resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionTracingConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionTracingConfig.ps1
index ec649893a..cec1a0f4a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionTracingConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionTracingConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaFunctionTracingConfig {
+function Add-VSLambdaFunctionTracingConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function.TracingConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionVpcConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionVpcConfig.ps1
index f191255ee..faa87dca9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionVpcConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLambdaFunctionVpcConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLambdaFunctionVpcConfig {
+function Add-VSLambdaFunctionVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function.VpcConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSLogsMetricFilterMetricTransformation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSLogsMetricFilterMetricTransformation.ps1
index 57589acc3..74eb9e0d8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSLogsMetricFilterMetricTransformation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSLogsMetricFilterMetricTransformation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSLogsMetricFilterMetricTransformation {
+function Add-VSLogsMetricFilterMetricTransformation {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::MetricFilter.MetricTransformation resource property to the template
@@ -45,7 +45,7 @@
         $DefaultValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -56,7 +56,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $MetricNamespace,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppDataSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppDataSource.ps1
index 288d3183e..f768d05f5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppDataSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppDataSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksAppDataSource {
+function Add-VSOpsWorksAppDataSource {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::App.DataSource resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Arn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $DatabaseName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppEnvironmentVariable.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppEnvironmentVariable.ps1
index 34fe6ea4f..20e4b47cd 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppEnvironmentVariable.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppEnvironmentVariable.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksAppEnvironmentVariable {
+function Add-VSOpsWorksAppEnvironmentVariable {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::App.EnvironmentVariable resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $Secure,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSource.ps1
index 6fe237b13..5a41b5521 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksAppSource {
+function Add-VSOpsWorksAppSource {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::App.Source resource property to the template
@@ -56,7 +56,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -78,7 +78,7 @@
         $Revision,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -89,7 +89,7 @@
         $SshKey,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -111,7 +111,7 @@
         $Url,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSslConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSslConfiguration.ps1
index e32e6b8d0..b9e081912 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSslConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksAppSslConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksAppSslConfiguration {
+function Add-VSOpsWorksAppSslConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::App.SslConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Certificate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Chain,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceBlockDeviceMapping.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceBlockDeviceMapping.ps1
index b776743a7..02f9f1ff3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceBlockDeviceMapping.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceBlockDeviceMapping.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksInstanceBlockDeviceMapping {
+function Add-VSOpsWorksInstanceBlockDeviceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Instance.BlockDeviceMapping resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $Ebs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -66,7 +66,7 @@
         $NoDevice,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceEbsBlockDevice.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceEbsBlockDevice.ps1
index 8bd1ec91e..63bfaba13 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceEbsBlockDevice.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceEbsBlockDevice.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksInstanceEbsBlockDevice {
+function Add-VSOpsWorksInstanceEbsBlockDevice {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Instance.EbsBlockDevice resource property to the template
@@ -54,7 +54,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -68,7 +68,7 @@
         $VolumeSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceTimeBasedAutoScaling.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceTimeBasedAutoScaling.ps1
index 864dfc018..8536160ef 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceTimeBasedAutoScaling.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksInstanceTimeBasedAutoScaling.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksInstanceTimeBasedAutoScaling {
+function Add-VSOpsWorksInstanceTimeBasedAutoScaling {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Instance.TimeBasedAutoScaling resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerAutoScalingThresholds.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerAutoScalingThresholds.ps1
index 7a8e62d6c..09096f02d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerAutoScalingThresholds.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerAutoScalingThresholds.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerAutoScalingThresholds {
+function Add-VSOpsWorksLayerAutoScalingThresholds {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.AutoScalingThresholds resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLifecycleEventConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLifecycleEventConfiguration.ps1
index 2185d4139..368cd1646 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLifecycleEventConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLifecycleEventConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerLifecycleEventConfiguration {
+function Add-VSOpsWorksLayerLifecycleEventConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.LifecycleEventConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLoadBasedAutoScaling.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLoadBasedAutoScaling.ps1
index 9e40cd2f5..55422a2e1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLoadBasedAutoScaling.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerLoadBasedAutoScaling.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerLoadBasedAutoScaling {
+function Add-VSOpsWorksLayerLoadBasedAutoScaling {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.LoadBasedAutoScaling resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerRecipes.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerRecipes.ps1
index 85d30951b..4147cfb69 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerRecipes.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerRecipes.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerRecipes {
+function Add-VSOpsWorksLayerRecipes {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.Recipes resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerShutdownEventConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerShutdownEventConfiguration.ps1
index 2d41d0374..100a39ecc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerShutdownEventConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerShutdownEventConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerShutdownEventConfiguration {
+function Add-VSOpsWorksLayerShutdownEventConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.ShutdownEventConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerVolumeConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerVolumeConfiguration.ps1
index a56dac19a..0a9295765 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerVolumeConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksLayerVolumeConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksLayerVolumeConfiguration {
+function Add-VSOpsWorksLayerVolumeConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer.VolumeConfiguration resource property to the template
@@ -57,7 +57,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -77,7 +77,7 @@
         $Size,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackChefConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackChefConfiguration.ps1
index e38a6295d..55cd5b841 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackChefConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackChefConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksStackChefConfiguration {
+function Add-VSOpsWorksStackChefConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack.ChefConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackElasticIp.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackElasticIp.ps1
index 3fea277a3..952f0bcfb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackElasticIp.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackElasticIp.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksStackElasticIp {
+function Add-VSOpsWorksStackElasticIp {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack.ElasticIp resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Ip,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackRdsDbInstance.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackRdsDbInstance.ps1
index eaec9007b..a4691cb5e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackRdsDbInstance.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackRdsDbInstance.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksStackRdsDbInstance {
+function Add-VSOpsWorksStackRdsDbInstance {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack.RdsDbInstance resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $DbPassword,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -60,7 +60,7 @@
         $DbUser,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackSource.ps1
index 0c83a5566..5d41469ab 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksStackSource {
+function Add-VSOpsWorksStackSource {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack.Source resource property to the template
@@ -56,7 +56,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -67,7 +67,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -78,7 +78,7 @@
         $Revision,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -89,7 +89,7 @@
         $SshKey,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -111,7 +111,7 @@
         $Url,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackStackConfigurationManager.ps1 b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackStackConfigurationManager.ps1
index 2cdd95531..b2a009ba9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackStackConfigurationManager.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSOpsWorksStackStackConfigurationManager.ps1	
@@ -1,4 +1,4 @@
-function Add-VSOpsWorksStackStackConfigurationManager {
+function Add-VSOpsWorksStackStackConfigurationManager {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack.StackConfigurationManager resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRDSDBSecurityGroupIngress.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRDSDBSecurityGroupIngress.ps1
index 6c3b9714d..45ad46c44 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRDSDBSecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRDSDBSecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRDSDBSecurityGroupIngress {
+function Add-VSRDSDBSecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBSecurityGroup.Ingress resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $CIDRIP,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $EC2SecurityGroupId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $EC2SecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionConfiguration.ps1
index e81d201cf..584c3c6fb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRDSOptionGroupOptionConfiguration {
+function Add-VSRDSOptionGroupOptionConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::OptionGroup.OptionConfiguration resource property to the template
@@ -60,7 +60,7 @@
         $DBSecurityGroupMemberships,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -73,7 +73,7 @@
         $OptionSettings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionSetting.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionSetting.ps1
index 21db3ca71..06d46ee31 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionSetting.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRDSOptionGroupOptionSetting.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRDSOptionGroupOptionSetting {
+function Add-VSRDSOptionGroupOptionSetting {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::OptionGroup.OptionSetting resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterLoggingProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterLoggingProperties.ps1
index 54b714fb3..868f2da7e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterLoggingProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterLoggingProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRedshiftClusterLoggingProperties {
+function Add-VSRedshiftClusterLoggingProperties {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::Cluster.LoggingProperties resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterParameterGroupParameter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterParameterGroupParameter.ps1
index 03577b778..1e92c249b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterParameterGroupParameter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRedshiftClusterParameterGroupParameter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRedshiftClusterParameterGroupParameter {
+function Add-VSRedshiftClusterParameterGroupParameter {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::ClusterParameterGroup.Parameter resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $ParameterName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckAlarmIdentifier.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckAlarmIdentifier.ps1
index 5f2521e13..3040fca0c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckAlarmIdentifier.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckAlarmIdentifier.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HealthCheckAlarmIdentifier {
+function Add-VSRoute53HealthCheckAlarmIdentifier {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HealthCheck.AlarmIdentifier resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckConfig.ps1
index e53ca429d..8701b81cb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HealthCheckHealthCheckConfig {
+function Add-VSRoute53HealthCheckHealthCheckConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HealthCheck.HealthCheckConfig resource property to the template
@@ -128,7 +128,7 @@
         $FailureThreshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $HealthThreshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $IPAddress,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -178,7 +178,7 @@
         $RequestInterval,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -189,7 +189,7 @@
         $ResourcePath,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -200,7 +200,7 @@
         $SearchString,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckTag.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckTag.ps1
index d00386ee8..dc71c36e4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckTag.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HealthCheckHealthCheckTag.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HealthCheckHealthCheckTag {
+function Add-VSRoute53HealthCheckHealthCheckTag {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HealthCheck.HealthCheckTag resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneConfig.ps1
index fab10ac26..4cdd05ce5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HostedZoneHostedZoneConfig {
+function Add-VSRoute53HostedZoneHostedZoneConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HostedZone.HostedZoneConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneTag.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneTag.ps1
index 9cf4dbc30..8469ab511 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneTag.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneHostedZoneTag.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HostedZoneHostedZoneTag {
+function Add-VSRoute53HostedZoneHostedZoneTag {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HostedZone.HostedZoneTag resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneQueryLoggingConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneQueryLoggingConfig.ps1
index 67818e830..c39b748e1 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneQueryLoggingConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneQueryLoggingConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HostedZoneQueryLoggingConfig {
+function Add-VSRoute53HostedZoneQueryLoggingConfig {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HostedZone.QueryLoggingConfig resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneVPC.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneVPC.ps1
index 9a4884ec7..bdce094f7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneVPC.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53HostedZoneVPC.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53HostedZoneVPC {
+function Add-VSRoute53HostedZoneVPC {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HostedZone.VPC resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $VPCId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetAliasTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetAliasTarget.ps1
index 45b5198c6..42710a5dc 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetAliasTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetAliasTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53RecordSetAliasTarget {
+function Add-VSRoute53RecordSetAliasTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSet.AliasTarget resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $EvaluateTargetHealth,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGeoLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGeoLocation.ps1
index 492e9c0a9..19f20a407 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGeoLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGeoLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53RecordSetGeoLocation {
+function Add-VSRoute53RecordSetGeoLocation {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSet.GeoLocation resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $ContinentCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $CountryCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupAliasTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupAliasTarget.ps1
index ff190d835..de406ec9a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupAliasTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupAliasTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53RecordSetGroupAliasTarget {
+function Add-VSRoute53RecordSetGroupAliasTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSetGroup.AliasTarget resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $EvaluateTargetHealth,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupGeoLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupGeoLocation.ps1
index 5bc77a5f8..f7aa61d29 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupGeoLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupGeoLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53RecordSetGroupGeoLocation {
+function Add-VSRoute53RecordSetGroupGeoLocation {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSetGroup.GeoLocation resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $ContinentCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $CountryCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupRecordSet.ps1 b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupRecordSet.ps1
index 22c87a701..818ec67a8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupRecordSet.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSRoute53RecordSetGroupRecordSet.ps1	
@@ -1,4 +1,4 @@
-function Add-VSRoute53RecordSetGroupRecordSet {
+function Add-VSRoute53RecordSetGroupRecordSet {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSetGroup.RecordSet resource property to the template
@@ -106,7 +106,7 @@
         $AliasTarget,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -117,7 +117,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $GeoLocation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $HealthCheckId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -152,7 +152,7 @@
         $HostedZoneId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $HostedZoneName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -187,7 +187,7 @@
         $ResourceRecords,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -198,7 +198,7 @@
         $SetIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -209,7 +209,7 @@
         $TTL,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAbortIncompleteMultipartUpload.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAbortIncompleteMultipartUpload.ps1
index b012f3267..8641c1246 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAbortIncompleteMultipartUpload.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAbortIncompleteMultipartUpload.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketAbortIncompleteMultipartUpload {
+function Add-VSS3BucketAbortIncompleteMultipartUpload {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.AbortIncompleteMultipartUpload resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccelerateConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccelerateConfiguration.ps1
index 5c045691b..c1e7ef52e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccelerateConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccelerateConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketAccelerateConfiguration {
+function Add-VSS3BucketAccelerateConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.AccelerateConfiguration resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccessControlTranslation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccessControlTranslation.ps1
index 982630c3a..e43c9838a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccessControlTranslation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAccessControlTranslation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketAccessControlTranslation {
+function Add-VSS3BucketAccessControlTranslation {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.AccessControlTranslation resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAnalyticsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAnalyticsConfiguration.ps1
index 95e1ff41e..554ebcea8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketAnalyticsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketAnalyticsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketAnalyticsConfiguration {
+function Add-VSS3BucketAnalyticsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.AnalyticsConfiguration resource property to the template
@@ -44,7 +44,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $Id,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketBucketEncryption.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketBucketEncryption.ps1
index b94948291..488a75a5c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketBucketEncryption.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketBucketEncryption.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketBucketEncryption {
+function Add-VSS3BucketBucketEncryption {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.BucketEncryption resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsConfiguration.ps1
index 79c5e22bb..28d762c8a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketCorsConfiguration {
+function Add-VSS3BucketCorsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.CorsConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsRule.ps1
index 2c4ab0e8c..84421109b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketCorsRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketCorsRule {
+function Add-VSS3BucketCorsRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.CorsRule resource property to the template
@@ -70,7 +70,7 @@
         $ExposedHeaders,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketDataExport.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketDataExport.ps1
index 90b5d04a2..68e0847ab 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketDataExport.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketDataExport.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketDataExport {
+function Add-VSS3BucketDataExport {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.DataExport resource property to the template
@@ -32,7 +32,7 @@
         $Destination,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketDestination.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketDestination.ps1
index fbf77d734..d6bc67ca0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketDestination.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketDestination.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketDestination {
+function Add-VSS3BucketDestination {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.Destination resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $BucketAccountId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $BucketArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $Format,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketEncryptionConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketEncryptionConfiguration.ps1
index 40961ce5b..0d2575c1b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketEncryptionConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketEncryptionConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketEncryptionConfiguration {
+function Add-VSS3BucketEncryptionConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.EncryptionConfiguration resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketFilterRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketFilterRule.ps1
index 8fda237b7..15ece4cf7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketFilterRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketFilterRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketFilterRule {
+function Add-VSS3BucketFilterRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.FilterRule resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketInventoryConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketInventoryConfiguration.ps1
index cb5681c03..89447aee7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketInventoryConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketInventoryConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketInventoryConfiguration {
+function Add-VSS3BucketInventoryConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.InventoryConfiguration resource property to the template
@@ -67,7 +67,7 @@
         $Enabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -78,7 +78,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $OptionalFields,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Prefix,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLambdaConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLambdaConfiguration.ps1
index 75347b55e..4f1ec42e8 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLambdaConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLambdaConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketLambdaConfiguration {
+function Add-VSS3BucketLambdaConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.LambdaConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $Filter,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLifecycleConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLifecycleConfiguration.ps1
index 69579dfb2..4e82deabe 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLifecycleConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLifecycleConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketLifecycleConfiguration {
+function Add-VSS3BucketLifecycleConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.LifecycleConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLoggingConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLoggingConfiguration.ps1
index fcfcdfa4e..493915161 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketLoggingConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketLoggingConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketLoggingConfiguration {
+function Add-VSS3BucketLoggingConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.LoggingConfiguration resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $DestinationBucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketMetricsConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketMetricsConfiguration.ps1
index d6cef13d7..7cee5f096 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketMetricsConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketMetricsConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketMetricsConfiguration {
+function Add-VSS3BucketMetricsConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.MetricsConfiguration resource property to the template
@@ -38,7 +38,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $Id,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNoncurrentVersionTransition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNoncurrentVersionTransition.ps1
index 00bcf8bbf..5f847a427 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNoncurrentVersionTransition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNoncurrentVersionTransition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketNoncurrentVersionTransition {
+function Add-VSS3BucketNoncurrentVersionTransition {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.NoncurrentVersionTransition resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationConfiguration.ps1
index 36e1ba031..a3f1fe56e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketNotificationConfiguration {
+function Add-VSS3BucketNotificationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.NotificationConfiguration resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationFilter.ps1
index 77900b121..518913977 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketNotificationFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketNotificationFilter {
+function Add-VSS3BucketNotificationFilter {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.NotificationFilter resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketQueueConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketQueueConfiguration.ps1
index 9d98b06d1..ca69bbb7c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketQueueConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketQueueConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketQueueConfiguration {
+function Add-VSS3BucketQueueConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.QueueConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $Filter,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectAllRequestsTo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectAllRequestsTo.ps1
index 8eacaf430..6dbb480ba 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectAllRequestsTo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectAllRequestsTo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketRedirectAllRequestsTo {
+function Add-VSS3BucketRedirectAllRequestsTo {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.RedirectAllRequestsTo resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $HostName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectRule.ps1
index 909f2276e..3ec6f64b7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRedirectRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketRedirectRule {
+function Add-VSS3BucketRedirectRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.RedirectRule resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $HostName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $HttpRedirectCode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $Protocol,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $ReplaceKeyPrefixWith,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationConfiguration.ps1
index 6047dfa8e..df0b58bab 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketReplicationConfiguration {
+function Add-VSS3BucketReplicationConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.ReplicationConfiguration resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationDestination.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationDestination.ps1
index 0b6ae3996..07125607d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationDestination.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationDestination.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketReplicationDestination {
+function Add-VSS3BucketReplicationDestination {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.ReplicationDestination resource property to the template
@@ -50,7 +50,7 @@
         $AccessControlTranslation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -61,7 +61,7 @@
         $Account,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $EncryptionConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationRule.ps1
index f5f0763e6..3afb7ee14 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketReplicationRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketReplicationRule {
+function Add-VSS3BucketReplicationRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.ReplicationRule resource property to the template
@@ -50,7 +50,7 @@
         $Destination,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -61,7 +61,7 @@
         $Id,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -74,7 +74,7 @@
         $SourceSelectionCriteria,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRule.ps1
index b2883b81d..121306746 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketRoutingRule {
+function Add-VSS3BucketRoutingRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.RoutingRule resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRuleCondition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRuleCondition.ps1
index 9980e9bf9..f34f0d520 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRuleCondition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRoutingRuleCondition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketRoutingRuleCondition {
+function Add-VSS3BucketRoutingRuleCondition {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.RoutingRuleCondition resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $HttpErrorCodeReturnedEquals,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRule.ps1
index 716169421..26a799e31 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketRule {
+function Add-VSS3BucketRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.Rule resource property to the template
@@ -103,7 +103,7 @@
         $ExpirationInDays,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $NoncurrentVersionTransitions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $Prefix,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketS3KeyFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketS3KeyFilter.ps1
index d67d98862..e176bb590 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketS3KeyFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketS3KeyFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketS3KeyFilter {
+function Add-VSS3BucketS3KeyFilter {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.S3KeyFilter resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionByDefault.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionByDefault.ps1
index c84d76361..e69cf0354 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionByDefault.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionByDefault.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketServerSideEncryptionByDefault {
+function Add-VSS3BucketServerSideEncryptionByDefault {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.ServerSideEncryptionByDefault resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $KMSMasterKeyID,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionRule.ps1
index 23b4d83b8..dedff8f6c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketServerSideEncryptionRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketServerSideEncryptionRule {
+function Add-VSS3BucketServerSideEncryptionRule {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.ServerSideEncryptionRule resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketSourceSelectionCriteria.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketSourceSelectionCriteria.ps1
index e48008959..0bfabda58 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketSourceSelectionCriteria.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketSourceSelectionCriteria.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketSourceSelectionCriteria {
+function Add-VSS3BucketSourceSelectionCriteria {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.SourceSelectionCriteria resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketSseKmsEncryptedObjects.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketSseKmsEncryptedObjects.ps1
index 763387444..bfc5fd4c2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketSseKmsEncryptedObjects.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketSseKmsEncryptedObjects.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketSseKmsEncryptedObjects {
+function Add-VSS3BucketSseKmsEncryptedObjects {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.SseKmsEncryptedObjects resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketStorageClassAnalysis.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketStorageClassAnalysis.ps1
index cedb09bcc..ce652a019 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketStorageClassAnalysis.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketStorageClassAnalysis.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketStorageClassAnalysis {
+function Add-VSS3BucketStorageClassAnalysis {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.StorageClassAnalysis resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTagFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTagFilter.ps1
index cedf96179..219602d3f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTagFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTagFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketTagFilter {
+function Add-VSS3BucketTagFilter {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.TagFilter resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Key,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTopicConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTopicConfiguration.ps1
index 2c1c10228..3b78da9ff 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTopicConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTopicConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketTopicConfiguration {
+function Add-VSS3BucketTopicConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.TopicConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
         $Filter,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTransition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTransition.ps1
index aa9f0d9fb..69c756c4e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketTransition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketTransition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketTransition {
+function Add-VSS3BucketTransition {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.Transition resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketVersioningConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketVersioningConfiguration.ps1
index c7f1d6545..b22b7e890 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketVersioningConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketVersioningConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketVersioningConfiguration {
+function Add-VSS3BucketVersioningConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.VersioningConfiguration resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSS3BucketWebsiteConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSS3BucketWebsiteConfiguration.ps1
index 06554b4e4..457bf4a22 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSS3BucketWebsiteConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSS3BucketWebsiteConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSS3BucketWebsiteConfiguration {
+function Add-VSS3BucketWebsiteConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket.WebsiteConfiguration resource property to the template
@@ -44,7 +44,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -55,7 +55,7 @@
         $ErrorDocument,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationCloudWatchDestination.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationCloudWatchDestination.ps1
index ae46ab9b7..1c94f4d7b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationCloudWatchDestination.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationCloudWatchDestination.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESConfigurationSetEventDestinationCloudWatchDestination {
+function Add-VSSESConfigurationSetEventDestinationCloudWatchDestination {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationDimensionConfiguration.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationDimensionConfiguration.ps1
index 8d6aaa3f0..656c1ae80 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationDimensionConfiguration.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationDimensionConfiguration.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESConfigurationSetEventDestinationDimensionConfiguration {
+function Add-VSSESConfigurationSetEventDestinationDimensionConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $DimensionValueSource,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $DefaultDimensionValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationEventDestination.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationEventDestination.ps1
index a5cad8d62..ce1cc21e4 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationEventDestination.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationEventDestination.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESConfigurationSetEventDestinationEventDestination {
+function Add-VSSESConfigurationSetEventDestinationEventDestination {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSetEventDestination.EventDestination resource property to the template
@@ -56,7 +56,7 @@
         $MatchingEventTypes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination.ps1
index 421568481..4a030fc2b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination {
+function Add-VSSESConfigurationSetEventDestinationKinesisFirehoseDestination {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $IAMRoleARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterFilter.ps1
index cd9285eac..b23acf467 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptFilterFilter {
+function Add-VSSESReceiptFilterFilter {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptFilter.Filter resource property to the template
@@ -32,7 +32,7 @@
         $IpFilter,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterIpFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterIpFilter.ps1
index 9de1fa817..73b765951 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterIpFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptFilterIpFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptFilterIpFilter {
+function Add-VSSESReceiptFilterIpFilter {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptFilter.IpFilter resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Policy,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAction.ps1
index 4457f28ea..093ba95ca 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleAction {
+function Add-VSSESReceiptRuleAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.Action resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAddHeaderAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAddHeaderAction.ps1
index 12f6d8f2c..0d4d30f55 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAddHeaderAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleAddHeaderAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleAddHeaderAction {
+function Add-VSSESReceiptRuleAddHeaderAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.AddHeaderAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $HeaderValue,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleBounceAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleBounceAction.ps1
index ecc9118e1..13d48e45e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleBounceAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleBounceAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleBounceAction {
+function Add-VSSESReceiptRuleBounceAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.BounceAction resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $Sender,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $SmtpReplyCode,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $Message,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $TopicArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleLambdaAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleLambdaAction.ps1
index 34b045c93..764b8579f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleLambdaAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleLambdaAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleLambdaAction {
+function Add-VSSESReceiptRuleLambdaAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.LambdaAction resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $FunctionArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $TopicArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleRule.ps1
index c7c65b29f..900bff678 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleRule {
+function Add-VSSESReceiptRuleRule {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.Rule resource property to the template
@@ -75,7 +75,7 @@
         $Enabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -86,7 +86,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleS3Action.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleS3Action.ps1
index a1d93a678..e8430732c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleS3Action.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleS3Action.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleS3Action {
+function Add-VSSESReceiptRuleS3Action {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.S3Action resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $KmsKeyArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $TopicArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleSNSAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleSNSAction.ps1
index cf10a06e8..e087c6cd3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleSNSAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleSNSAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleSNSAction {
+function Add-VSSESReceiptRuleSNSAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.SNSAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $TopicArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleStopAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleStopAction.ps1
index 5a514da4d..596998a8a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleStopAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleStopAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleStopAction {
+function Add-VSSESReceiptRuleStopAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.StopAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Scope,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleWorkmailAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleWorkmailAction.ps1
index a1077c65c..0dc776f74 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleWorkmailAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESReceiptRuleWorkmailAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESReceiptRuleWorkmailAction {
+function Add-VSSESReceiptRuleWorkmailAction {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule.WorkmailAction resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $TopicArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSESTemplateTemplate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSESTemplateTemplate.ps1
index 89cd3be19..4ce578210 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSESTemplateTemplate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSESTemplateTemplate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSESTemplateTemplate {
+function Add-VSSESTemplateTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::SES::Template.Template resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -53,7 +53,7 @@
         $HtmlPart,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $TextPart,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $TemplateName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSNSTopicSubscription.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSNSTopicSubscription.ps1
index 51c4ec35a..915e6bb4c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSNSTopicSubscription.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSNSTopicSubscription.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSNSTopicSubscription {
+function Add-VSSNSTopicSubscription {
     <#
     .SYNOPSIS
         Adds an AWS::SNS::Topic.Subscription resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Endpoint,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationInstanceAssociationOutputLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationInstanceAssociationOutputLocation.ps1
index 884bdcb62..824d234b2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationInstanceAssociationOutputLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationInstanceAssociationOutputLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMAssociationInstanceAssociationOutputLocation {
+function Add-VSSSMAssociationInstanceAssociationOutputLocation {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Association.InstanceAssociationOutputLocation resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationParameterValues.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationParameterValues.ps1
index ac31d90d8..fe0983c0d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationParameterValues.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationParameterValues.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMAssociationParameterValues {
+function Add-VSSSMAssociationParameterValues {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Association.ParameterValues resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationS3OutputLocation.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationS3OutputLocation.ps1
index 542cb6b62..eb820fcc3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationS3OutputLocation.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationS3OutputLocation.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMAssociationS3OutputLocation {
+function Add-VSSSMAssociationS3OutputLocation {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Association.S3OutputLocation resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $OutputS3BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationTarget.ps1
index 3ef42ec3b..40eafc355 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMAssociationTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMAssociationTarget {
+function Add-VSSSMAssociationTarget {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Association.Target resource property to the template
@@ -32,7 +32,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskLoggingInfo.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskLoggingInfo.ps1
index a3de3726b..4f8968574 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskLoggingInfo.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskLoggingInfo.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskLoggingInfo {
+function Add-VSSSMMaintenanceWindowTaskLoggingInfo {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.LoggingInfo resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $S3Bucket,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Region,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters.ps1
index 4c70be8f0..f1bb75d3d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters {
+function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowAutomationParameters {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters resource property to the template
@@ -41,7 +41,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters.ps1
index b52c9550e..b4138a0a9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters {
+function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowLambdaParameters {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $ClientContext,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Qualifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters.ps1
index b749a54d1..80bdc2b33 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters {
+function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowRunCommandParameters {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters resource property to the template
@@ -75,7 +75,7 @@
         $TimeoutSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -86,7 +86,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $DocumentHashType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -132,7 +132,7 @@
         $NotificationConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -143,7 +143,7 @@
         $OutputS3BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters.ps1
index de2e37ff5..21c6355ac 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters {
+function Add-VSSSMMaintenanceWindowTaskMaintenanceWindowStepFunctionsParameters {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Input,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskNotificationConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskNotificationConfig.ps1
index 9ff9fb548..7e5a08c1d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskNotificationConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskNotificationConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskNotificationConfig {
+function Add-VSSSMMaintenanceWindowTaskNotificationConfig {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.NotificationConfig resource property to the template
@@ -37,7 +37,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -48,7 +48,7 @@
         $NotificationArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTarget.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTarget.ps1
index c1a4cfdcc..6afc93a86 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTarget.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTarget.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskTarget {
+function Add-VSSSMMaintenanceWindowTaskTarget {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.Target resource property to the template
@@ -33,7 +33,7 @@
         $Values,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters.ps1
index 7b107bde3..61b763937 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters {
+function Add-VSSSMMaintenanceWindowTaskTaskInvocationParameters {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilter.ps1
index 156cec2be..f566dfc2f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMPatchBaselinePatchFilter {
+function Add-VSSSMPatchBaselinePatchFilter {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline.PatchFilter resource property to the template
@@ -33,7 +33,7 @@
         $Values,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilterGroup.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilterGroup.ps1
index 841e3e962..121513bc0 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilterGroup.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchFilterGroup.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMPatchBaselinePatchFilterGroup {
+function Add-VSSSMPatchBaselinePatchFilterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline.PatchFilterGroup resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchSource.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchSource.ps1
index d20a47f67..cec389e97 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchSource.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselinePatchSource.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMPatchBaselinePatchSource {
+function Add-VSSSMPatchBaselinePatchSource {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline.PatchSource resource property to the template
@@ -39,7 +39,7 @@
         $Products,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $Configuration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRule.ps1
index fc078011c..79f90c48f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMPatchBaselineRule {
+function Add-VSSSMPatchBaselineRule {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline.Rule resource property to the template
@@ -50,7 +50,7 @@
         $ApproveAfterDays,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRuleGroup.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRuleGroup.ps1
index 5b79621e9..3ab73c1f7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRuleGroup.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSSMPatchBaselineRuleGroup.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSSMPatchBaselineRuleGroup {
+function Add-VSSSMPatchBaselineRuleGroup {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline.RuleGroup resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSageMakerEndpointConfigProductionVariant.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSageMakerEndpointConfigProductionVariant.ps1
index e6e16ebfc..1ad9fc5e7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSageMakerEndpointConfigProductionVariant.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSageMakerEndpointConfigProductionVariant.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSageMakerEndpointConfigProductionVariant {
+function Add-VSSageMakerEndpointConfigProductionVariant {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::EndpointConfig.ProductionVariant resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $ModelName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -73,7 +73,7 @@
         $InitialInstanceCount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelContainerDefinition.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelContainerDefinition.ps1
index be1007423..2bdd207a6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelContainerDefinition.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelContainerDefinition.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSageMakerModelContainerDefinition {
+function Add-VSSageMakerModelContainerDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::Model.ContainerDefinition resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -64,7 +64,7 @@
         $Environment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -75,7 +75,7 @@
         $ModelDataUrl,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelVpcConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelVpcConfig.ps1
index 85e341ca7..ea868658c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelVpcConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSageMakerModelVpcConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSageMakerModelVpcConfig {
+function Add-VSSageMakerModelVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::Model.VpcConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook.ps1 b/VaporShell/Public/Resource Property Types/Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook.ps1
index 8eaa38300..8840ff423 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook.ps1	
@@ -1,4 +1,4 @@
-function Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook {
+function Add-VSSageMakerNotebookInstanceLifecycleConfigNotebookInstanceLifecycleHook {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties.ps1
index aea59a994..25889941c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties {
+function Add-VSServiceCatalogCloudFormationProductProvisioningArtifactProperties {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Info,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter.ps1
index 1bdc78903..41d06e7e7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter {
+function Add-VSServiceCatalogCloudFormationProvisionedProductProvisioningParameter {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Value,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsConfig.ps1
index 31f11cca2..559192ac7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceDiscoveryServiceDnsConfig {
+function Add-VSServiceDiscoveryServiceDnsConfig {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Service.DnsConfig resource property to the template
@@ -48,7 +48,7 @@
         $DnsRecords,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $RoutingPolicy,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsRecord.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsRecord.ps1
index b30629dfb..d93d8525a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsRecord.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceDnsRecord.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceDiscoveryServiceDnsRecord {
+function Add-VSServiceDiscoveryServiceDnsRecord {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Service.DnsRecord resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckConfig.ps1
index 9962e42c7..741ed5ec5 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceDiscoveryServiceHealthCheckConfig {
+function Add-VSServiceDiscoveryServiceHealthCheckConfig {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Service.HealthCheckConfig resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckCustomConfig.ps1 b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckCustomConfig.ps1
index a4e736cb1..fae846249 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckCustomConfig.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSServiceDiscoveryServiceHealthCheckCustomConfig.ps1	
@@ -1,4 +1,4 @@
-function Add-VSServiceDiscoveryServiceHealthCheckCustomConfig {
+function Add-VSServiceDiscoveryServiceHealthCheckCustomConfig {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Service.HealthCheckCustomConfig resource property to the template
diff --git a/VaporShell/Public/Resource Property Types/Add-VSTag.ps1 b/VaporShell/Public/Resource Property Types/Add-VSTag.ps1
index 806322aa7..41d696a73 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSTag.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSTag.ps1	
@@ -1,4 +1,4 @@
-function Add-VSTag {
+function Add-VSTag {
     <#
     .SYNOPSIS
         Adds an Tag resource property to the template
@@ -7,18 +7,18 @@
         Adds an Tag resource property to the template
 
     .LINK
-        http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html
+        http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
 
-    .PARAMETER Value
-		Required: False    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-value    
+    .PARAMETER Key
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-key    
 		PrimitiveType: String    
+		Required: True    
 		UpdateType: Mutable    
 
-    .PARAMETER Key
-		Required: False    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-key    
+    .PARAMETER Value
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-value    
 		PrimitiveType: String    
+		Required: True    
 		UpdateType: Mutable    
 
     .FUNCTIONALITY
@@ -28,9 +28,9 @@
     [cmdletbinding()]
     Param
     (
-        [parameter(Mandatory = $false)]
+        [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -38,10 +38,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $Value,
-        [parameter(Mandatory = $false)]
+        $Key,
+        [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -49,7 +49,7 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $Key
+        $Value
     )
     Begin {
         $obj = [PSCustomObject]@{}
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetByteMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetByteMatchTuple.ps1
index e44192e53..819c70433 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetByteMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetByteMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFByteMatchSetByteMatchTuple {
+function Add-VSWAFByteMatchSetByteMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::ByteMatchSet.ByteMatchTuple resource property to the template
@@ -50,7 +50,7 @@
         $FieldToMatch,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -61,7 +61,7 @@
         $PositionalConstraint,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -72,7 +72,7 @@
         $TargetString,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -83,7 +83,7 @@
         $TargetStringBase64,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetFieldToMatch.ps1
index dbea9f3f3..2e8f29a44 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFByteMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFByteMatchSetFieldToMatch {
+function Add-VSWAFByteMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::ByteMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Data,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFIPSetIPSetDescriptor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFIPSetIPSetDescriptor.ps1
index 8a7004846..00141ec3f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFIPSetIPSetDescriptor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFIPSetIPSetDescriptor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFIPSetIPSetDescriptor {
+function Add-VSWAFIPSetIPSetDescriptor {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::IPSet.IPSetDescriptor resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetByteMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetByteMatchTuple.ps1
index bc47cbbab..9b61f8cb3 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetByteMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetByteMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalByteMatchSetByteMatchTuple {
+function Add-VSWAFRegionalByteMatchSetByteMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::ByteMatchSet.ByteMatchTuple resource property to the template
@@ -48,7 +48,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -59,7 +59,7 @@
         $TargetString,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -70,7 +70,7 @@
         $TargetStringBase64,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -81,7 +81,7 @@
         $PositionalConstraint,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetFieldToMatch.ps1
index 4d0ed83da..e4f80555d 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalByteMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalByteMatchSetFieldToMatch {
+function Add-VSWAFRegionalByteMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::ByteMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalIPSetIPSetDescriptor.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalIPSetIPSetDescriptor.ps1
index 36e798862..2284ad5f9 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalIPSetIPSetDescriptor.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalIPSetIPSetDescriptor.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalIPSetIPSetDescriptor {
+function Add-VSWAFRegionalIPSetIPSetDescriptor {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::IPSet.IPSetDescriptor resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalRulePredicate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalRulePredicate.ps1
index 69b4bd824..5f7a3050f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalRulePredicate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalRulePredicate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalRulePredicate {
+function Add-VSWAFRegionalRulePredicate {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::Rule.Predicate resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -47,7 +47,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetFieldToMatch.ps1
index ea54ebb86..700e0b4e7 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalSizeConstraintSetFieldToMatch {
+function Add-VSWAFRegionalSizeConstraintSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SizeConstraintSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetSizeConstraint.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetSizeConstraint.ps1
index 2a39b74f9..718c14c8b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetSizeConstraint.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSizeConstraintSetSizeConstraint.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalSizeConstraintSetSizeConstraint {
+function Add-VSWAFRegionalSizeConstraintSetSizeConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SizeConstraintSet.SizeConstraint resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -56,7 +56,7 @@
         $Size,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch.ps1
index 20494ef93..da8857c58 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch {
+function Add-VSWAFRegionalSqlInjectionMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple.ps1
index 63ccad3f0..44653fda2 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple {
+function Add-VSWAFRegionalSqlInjectionMatchSetSqlInjectionMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLAction.ps1
index 3fbde2f67..33517e9f6 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalWebACLAction {
+function Add-VSWAFRegionalWebACLAction {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::WebACL.Action resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLRule.ps1
index 1a146bbf7..323df6b0e 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalWebACLRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalWebACLRule {
+function Add-VSWAFRegionalWebACLRule {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::WebACL.Rule resource property to the template
@@ -41,7 +41,7 @@
         $Priority,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetFieldToMatch.ps1
index b543cdfd8..1df037a7a 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalXssMatchSetFieldToMatch {
+function Add-VSWAFRegionalXssMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::XssMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetXssMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetXssMatchTuple.ps1
index 8cbc46144..d81c1e493 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetXssMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRegionalXssMatchSetXssMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRegionalXssMatchSetXssMatchTuple {
+function Add-VSWAFRegionalXssMatchSetXssMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::XssMatchSet.XssMatchTuple resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFRulePredicate.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFRulePredicate.ps1
index a5d95641d..3d21e7b10 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFRulePredicate.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFRulePredicate.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFRulePredicate {
+function Add-VSWAFRulePredicate {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::Rule.Predicate resource property to the template
@@ -36,7 +36,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -50,7 +50,7 @@
         $Negated,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetFieldToMatch.ps1
index 1b08a2beb..72fc86c3c 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFSizeConstraintSetFieldToMatch {
+function Add-VSWAFSizeConstraintSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SizeConstraintSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Data,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetSizeConstraint.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetSizeConstraint.ps1
index 213cd6401..40a856069 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetSizeConstraint.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFSizeConstraintSetSizeConstraint.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFSizeConstraintSetSizeConstraint {
+function Add-VSWAFSizeConstraintSetSizeConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SizeConstraintSet.SizeConstraint resource property to the template
@@ -42,7 +42,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -58,7 +58,7 @@
         $Size,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetFieldToMatch.ps1
index 4f0259ada..3c7c9e4ce 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFSqlInjectionMatchSetFieldToMatch {
+function Add-VSWAFSqlInjectionMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SqlInjectionMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Data,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple.ps1
index 28ce40158..51e10fffb 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple {
+function Add-VSWAFSqlInjectionMatchSetSqlInjectionMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple resource property to the template
@@ -32,7 +32,7 @@
         $FieldToMatch,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLActivatedRule.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLActivatedRule.ps1
index 5915b78b3..b8c5c35cf 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLActivatedRule.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLActivatedRule.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFWebACLActivatedRule {
+function Add-VSWAFWebACLActivatedRule {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::WebACL.ActivatedRule resource property to the template
@@ -11,7 +11,7 @@
 
     .PARAMETER Action
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-action    
-		Required: True    
+		Required: False    
 		Type: WafAction    
 		UpdateType: Mutable    
 
@@ -34,14 +34,14 @@
     [cmdletbinding()]
     Param
     (
-        [parameter(Mandatory = $true)]
+        [parameter(Mandatory = $false)]
         $Action,
         [parameter(Mandatory = $true)]
         [Int]
         $Priority,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLWafAction.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLWafAction.ps1
index 4f7cb36fe..fbd73ee4b 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLWafAction.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFWebACLWafAction.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFWebACLWafAction {
+function Add-VSWAFWebACLWafAction {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::WebACL.WafAction resource property to the template
@@ -24,7 +24,7 @@
     (
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetFieldToMatch.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetFieldToMatch.ps1
index b21fb7dcb..471e3110f 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetFieldToMatch.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetFieldToMatch.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFXssMatchSetFieldToMatch {
+function Add-VSWAFXssMatchSetFieldToMatch {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::XssMatchSet.FieldToMatch resource property to the template
@@ -30,7 +30,7 @@
     (
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -41,7 +41,7 @@
         $Data,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetXssMatchTuple.ps1 b/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetXssMatchTuple.ps1
index 2e555bcc9..e70612288 100644
--- a/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetXssMatchTuple.ps1	
+++ b/VaporShell/Public/Resource Property Types/Add-VSWAFXssMatchSetXssMatchTuple.ps1	
@@ -1,4 +1,4 @@
-function Add-VSWAFXssMatchSetXssMatchTuple {
+function Add-VSWAFXssMatchSetXssMatchTuple {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::XssMatchSet.XssMatchTuple resource property to the template
@@ -32,7 +32,7 @@
         $FieldToMatch,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAmazonMQBroker.ps1 b/VaporShell/Public/Resource Types/New-VSAmazonMQBroker.ps1
index 357e8b7ab..b63d0c029 100644
--- a/VaporShell/Public/Resource Types/New-VSAmazonMQBroker.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAmazonMQBroker.ps1	
@@ -1,4 +1,4 @@
-function New-VSAmazonMQBroker {
+function New-VSAmazonMQBroker {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker resource to the template
@@ -37,24 +37,12 @@
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-maintenancewindowstarttime    
 		UpdateType: Immutable    
 
-    .PARAMETER DeploymentMode
-		Required: True    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-deploymentmode    
-		PrimitiveType: String    
-		UpdateType: Immutable    
-
     .PARAMETER HostInstanceType
 		Required: True    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-hostinstancetype    
 		PrimitiveType: String    
 		UpdateType: Immutable    
 
-    .PARAMETER EngineType
-		Required: True    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-enginetype    
-		PrimitiveType: String    
-		UpdateType: Immutable    
-
     .PARAMETER AutoMinorVersionUpgrade
 		Required: True    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-autominorversionupgrade    
@@ -68,11 +56,11 @@
 		ItemType: User    
 		UpdateType: Mutable    
 
-    .PARAMETER PubliclyAccessible
-		Required: True    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-publiclyaccessible    
-		PrimitiveType: Boolean    
-		UpdateType: Immutable    
+    .PARAMETER Logs
+		Type: LogList    
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-logs    
+		UpdateType: Mutable    
 
     .PARAMETER SubnetIds
 		PrimitiveItemType: String    
@@ -87,6 +75,24 @@
 		PrimitiveType: String    
 		UpdateType: Immutable    
 
+    .PARAMETER DeploymentMode
+		Required: True    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-deploymentmode    
+		PrimitiveType: String    
+		UpdateType: Immutable    
+
+    .PARAMETER EngineType
+		Required: True    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-enginetype    
+		PrimitiveType: String    
+		UpdateType: Immutable    
+
+    .PARAMETER PubliclyAccessible
+		Required: True    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-publiclyaccessible    
+		PrimitiveType: Boolean    
+		UpdateType: Immutable    
+
     .PARAMETER DeletionPolicy
         With the DeletionPolicy attribute you can preserve or (in some cases) backup a resource when its stack is deleted. You specify a DeletionPolicy attribute for each resource that you want to control. If a resource has no DeletionPolicy attribute, AWS CloudFormation deletes the resource by default.
 
@@ -138,7 +144,7 @@
         $SecurityGroups,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +159,7 @@
         $MaintenanceWindowStartTime,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,10 +167,13 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $DeploymentMode,
+        $HostInstanceType,
+        [parameter(Mandatory = $true)]
+        [System.Boolean]
+        $AutoMinorVersionUpgrade,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "Vaporshell.Resource.AmazonMQ.Broker.User"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,10 +181,14 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $HostInstanceType,
+        $Users,
+        [parameter(Mandatory = $false)]
+        $Logs,
+        [parameter(Mandatory = $false)]
+        $SubnetIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -183,13 +196,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $EngineType,
-        [parameter(Mandatory = $true)]
-        [System.Boolean]
-        $AutoMinorVersionUpgrade,
+        $BrokerName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "Vaporshell.Resource.AmazonMQ.Broker.User"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -197,15 +207,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $Users,
-        [parameter(Mandatory = $true)]
-        [System.Boolean]
-        $PubliclyAccessible,
-        [parameter(Mandatory = $false)]
-        $SubnetIds,
+        $DeploymentMode,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -213,7 +218,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $BrokerName,
+        $EngineType,
+        [parameter(Mandatory = $true)]
+        [System.Boolean]
+        $PubliclyAccessible,
         [ValidateSet("Delete","Retain","Snapshot")]
         [System.String]
         $DeletionPolicy,
diff --git a/VaporShell/Public/Resource Types/New-VSAmazonMQConfiguration.ps1 b/VaporShell/Public/Resource Types/New-VSAmazonMQConfiguration.ps1
index 390a407ed..01d44249e 100644
--- a/VaporShell/Public/Resource Types/New-VSAmazonMQConfiguration.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAmazonMQConfiguration.ps1	
@@ -1,4 +1,4 @@
-function New-VSAmazonMQConfiguration {
+function New-VSAmazonMQConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Configuration resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $EngineVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $EngineType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $Data,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayAccount.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayAccount.ps1
index dfe70b8d9..50c26df8b 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayAccount.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayAccount.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayAccount {
+function New-VSApiGatewayAccount {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Account resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayApiKey.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayApiKey.ps1
index 8b914fa9c..258025e30 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayApiKey.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayApiKey.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayApiKey {
+function New-VSApiGatewayApiKey {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::ApiKey resource to the template
@@ -99,7 +99,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $CustomerId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $GenerateDistinctId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayAuthorizer.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayAuthorizer.ps1
index bca8ab2a6..482493f66 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayAuthorizer.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayAuthorizer.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayAuthorizer {
+function New-VSApiGatewayAuthorizer {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Authorizer resource to the template
@@ -125,7 +125,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $AuthType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -150,7 +150,7 @@
         $AuthorizerResultTtlInSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $AuthorizerUri,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,7 +172,7 @@
         $IdentitySource,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -183,7 +183,7 @@
         $IdentityValidationExpression,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -196,7 +196,7 @@
         $ProviderARNs,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -207,7 +207,7 @@
         $RestApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayBasePathMapping.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayBasePathMapping.ps1
index 06afd5c9d..e0180c64d 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayBasePathMapping.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayBasePathMapping.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayBasePathMapping {
+function New-VSApiGatewayBasePathMapping {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::BasePathMapping resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $BasePath,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $DomainName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $RestApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayClientCertificate.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayClientCertificate.ps1
index a4f803fb9..930c72ea4 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayClientCertificate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayClientCertificate.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayClientCertificate {
+function New-VSApiGatewayClientCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::ClientCertificate resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayDeployment.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayDeployment.ps1
index fe34898b6..f0d4dac62 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayDeployment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayDeployment.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayDeployment {
+function New-VSApiGatewayDeployment {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $StageDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationPart.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationPart.ps1
index f5a4ffa81..c5bfb22ba 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationPart.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationPart.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayDocumentationPart {
+function New-VSApiGatewayDocumentationPart {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DocumentationPart resource to the template
@@ -81,7 +81,7 @@
         $Location,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $Properties,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationVersion.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationVersion.ps1
index a5c8968e5..0142e4c29 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationVersion.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayDocumentationVersion.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayDocumentationVersion {
+function New-VSApiGatewayDocumentationVersion {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DocumentationVersion resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $DocumentationVersion,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayDomainName.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayDomainName.ps1
index 5f70c186d..2dcdde172 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayDomainName.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayDomainName.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayDomainName {
+function New-VSApiGatewayDomainName {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DomainName resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $CertificateArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $EndpointConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayGatewayResponse.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayGatewayResponse.ps1
index 89b7c6f2e..6bf58a4e2 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayGatewayResponse.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayGatewayResponse.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayGatewayResponse {
+function New-VSApiGatewayGatewayResponse {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::GatewayResponse resource to the template
@@ -101,7 +101,7 @@
         $ResponseTemplates,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -112,7 +112,7 @@
         $ResponseType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -123,7 +123,7 @@
         $RestApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayMethod.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayMethod.ps1
index 3cd7ad75e..a9854bcd2 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayMethod.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayMethod.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayMethod {
+function New-VSApiGatewayMethod {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method resource to the template
@@ -142,7 +142,7 @@
         $ApiKeyRequired,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $AuthorizationType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $AuthorizerId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -188,7 +188,7 @@
         $MethodResponses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -205,7 +205,7 @@
         $RequestParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -216,7 +216,7 @@
         $RequestValidatorId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -227,7 +227,7 @@
         $ResourceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayModel.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayModel.ps1
index b0f9e482e..5ca846c24 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayModel.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayModel.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayModel {
+function New-VSApiGatewayModel {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Model resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $ContentType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayRequestValidator.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayRequestValidator.ps1
index 031c1014f..9edc59847 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayRequestValidator.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayRequestValidator.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayRequestValidator {
+function New-VSApiGatewayRequestValidator {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RequestValidator resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayResource.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayResource.ps1
index db7f85eaf..095faf546 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayResource.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayResource.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayResource {
+function New-VSApiGatewayResource {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Resource resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $ParentId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $PathPart,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayRestApi.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayRestApi.ps1
index c6a7c6100..7b94c6daa 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayRestApi.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayRestApi.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayRestApi {
+function New-VSApiGatewayRestApi {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RestApi resource to the template
@@ -137,7 +137,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $BodyS3Location,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $CloneFrom,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -193,7 +193,7 @@
         $MinimumCompressionSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayStage.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayStage.ps1
index e79dc6685..f557ca642 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayStage.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayStage.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayStage {
+function New-VSApiGatewayStage {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Stage resource to the template
@@ -128,7 +128,7 @@
         $CacheClusterEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $CacheClusterSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -150,7 +150,7 @@
         $ClientCertificateId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $DeploymentId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,7 +172,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -194,7 +194,7 @@
         $MethodSettings,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -205,7 +205,7 @@
         $RestApiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlan.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlan.ps1
index b74b7d4cf..96b0c49ba 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlan.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlan.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayUsagePlan {
+function New-VSApiGatewayUsagePlan {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan resource to the template
@@ -104,7 +104,7 @@
         $ApiStages,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $Throttle,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlanKey.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlanKey.ps1
index f4d3d9854..8f179fe2b 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlanKey.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayUsagePlanKey.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayUsagePlanKey {
+function New-VSApiGatewayUsagePlanKey {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlanKey resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $KeyId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $KeyType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApiGatewayVpcLink.ps1 b/VaporShell/Public/Resource Types/New-VSApiGatewayVpcLink.ps1
index 3ecf8f075..a94d3fe27 100644
--- a/VaporShell/Public/Resource Types/New-VSApiGatewayVpcLink.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApiGatewayVpcLink.ps1	
@@ -1,4 +1,4 @@
-function New-VSApiGatewayVpcLink {
+function New-VSApiGatewayVpcLink {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::VpcLink resource to the template
@@ -80,7 +80,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $TargetArns,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAppSyncApiKey.ps1 b/VaporShell/Public/Resource Types/New-VSAppSyncApiKey.ps1
index 360688eab..aab0d186f 100644
--- a/VaporShell/Public/Resource Types/New-VSAppSyncApiKey.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAppSyncApiKey.ps1	
@@ -1,4 +1,4 @@
-function New-VSAppSyncApiKey {
+function New-VSAppSyncApiKey {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::ApiKey resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $Expires,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAppSyncDataSource.ps1 b/VaporShell/Public/Resource Types/New-VSAppSyncDataSource.ps1
index 57c4354a5..f1eeccdbb 100644
--- a/VaporShell/Public/Resource Types/New-VSAppSyncDataSource.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAppSyncDataSource.ps1	
@@ -1,4 +1,4 @@
-function New-VSAppSyncDataSource {
+function New-VSAppSyncDataSource {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource resource to the template
@@ -115,7 +115,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -152,7 +152,7 @@
         $LambdaConfig,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $ApiId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLApi.ps1 b/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLApi.ps1
index 75af90836..9a5154b91 100644
--- a/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLApi.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLApi.ps1	
@@ -1,4 +1,4 @@
-function New-VSAppSyncGraphQLApi {
+function New-VSAppSyncGraphQLApi {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLApi resource to the template
@@ -95,7 +95,7 @@
         $UserPoolConfig,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -106,7 +106,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLSchema.ps1 b/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLSchema.ps1
index 751075bc8..507b8d3df 100644
--- a/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLSchema.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAppSyncGraphQLSchema.ps1	
@@ -1,4 +1,4 @@
-function New-VSAppSyncGraphQLSchema {
+function New-VSAppSyncGraphQLSchema {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLSchema resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Definition,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $DefinitionS3Location,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAppSyncResolver.ps1 b/VaporShell/Public/Resource Types/New-VSAppSyncResolver.ps1
index 8748cc765..048585d64 100644
--- a/VaporShell/Public/Resource Types/New-VSAppSyncResolver.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAppSyncResolver.ps1	
@@ -1,4 +1,4 @@
-function New-VSAppSyncResolver {
+function New-VSAppSyncResolver {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::Resolver resource to the template
@@ -109,7 +109,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $ResponseMappingTemplateS3Location,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $TypeName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $DataSourceName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $RequestMappingTemplate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $ResponseMappingTemplate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -175,7 +175,7 @@
         $RequestMappingTemplateS3Location,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -186,7 +186,7 @@
         $ApiId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalableTarget.ps1 b/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalableTarget.ps1
index 348e855da..cd09cf57e 100644
--- a/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalableTarget.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalableTarget.ps1	
@@ -1,4 +1,4 @@
-function New-VSApplicationAutoScalingScalableTarget {
+function New-VSApplicationAutoScalingScalableTarget {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalableTarget resource to the template
@@ -111,7 +111,7 @@
         $MinCapacity,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $ResourceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -133,7 +133,7 @@
         $RoleARN,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -155,7 +155,7 @@
         $ScheduledActions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalingPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalingPolicy.ps1
index 86017aa03..30fff5fc2 100644
--- a/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalingPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSApplicationAutoScalingScalingPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSApplicationAutoScalingScalingPolicy {
+function New-VSApplicationAutoScalingScalingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::ApplicationAutoScaling::ScalingPolicy resource to the template
@@ -109,7 +109,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $PolicyName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $PolicyType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $ResourceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $ScalableDimension,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $ScalingTargetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAthenaNamedQuery.ps1 b/VaporShell/Public/Resource Types/New-VSAthenaNamedQuery.ps1
index 8c145db5c..821dafcf5 100644
--- a/VaporShell/Public/Resource Types/New-VSAthenaNamedQuery.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAthenaNamedQuery.ps1	
@@ -1,4 +1,4 @@
-function New-VSAthenaNamedQuery {
+function New-VSAthenaNamedQuery {
     <#
     .SYNOPSIS
         Adds an AWS::Athena::NamedQuery resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $QueryString,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $Database,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingAutoScalingGroup.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingAutoScalingGroup.ps1
index 5422459c2..4fef3aadf 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingAutoScalingGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingAutoScalingGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingAutoScalingGroup {
+function New-VSAutoScalingAutoScalingGroup {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::AutoScalingGroup resource to the template
@@ -204,7 +204,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -217,7 +217,7 @@
         $AvailabilityZones,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -228,7 +228,7 @@
         $Cooldown,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -242,7 +242,7 @@
         $HealthCheckGracePeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -253,7 +253,7 @@
         $HealthCheckType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -264,7 +264,7 @@
         $InstanceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -288,7 +288,7 @@
         $LoadBalancerNames,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -310,7 +310,7 @@
         $MetricsCollection,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -332,7 +332,7 @@
         $NotificationConfigurations,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -343,7 +343,7 @@
         $PlacementGroup,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingLaunchConfiguration.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingLaunchConfiguration.ps1
index c9880ca8d..fa38db5fd 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingLaunchConfiguration.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingLaunchConfiguration.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingLaunchConfiguration {
+function New-VSAutoScalingLaunchConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::LaunchConfiguration resource to the template
@@ -189,7 +189,7 @@
         $BlockDeviceMappings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -205,7 +205,7 @@
         $EbsOptimized,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -216,7 +216,7 @@
         $IamInstanceProfile,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -227,7 +227,7 @@
         $ImageId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -241,7 +241,7 @@
         $InstanceMonitoring,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -252,7 +252,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -263,7 +263,7 @@
         $KernelId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -274,7 +274,7 @@
         $KeyName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -285,7 +285,7 @@
         $LaunchConfigurationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -296,7 +296,7 @@
         $PlacementTenancy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -309,7 +309,7 @@
         $SecurityGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingLifecycleHook.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingLifecycleHook.ps1
index 143f65431..c7f08208b 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingLifecycleHook.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingLifecycleHook.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingLifecycleHook {
+function New-VSAutoScalingLifecycleHook {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::LifecycleHook resource to the template
@@ -109,7 +109,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $AutoScalingGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $HeartbeatTimeout,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $LifecycleHookName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -156,7 +156,7 @@
         $LifecycleTransition,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -167,7 +167,7 @@
         $NotificationMetadata,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -178,7 +178,7 @@
         $NotificationTargetARN,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingPlansScalingPlan.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingPlansScalingPlan.ps1
index 7464b8005..3e8426808 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingPlansScalingPlan.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingPlansScalingPlan.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingPlansScalingPlan {
+function New-VSAutoScalingPlansScalingPlan {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScalingPlans::ScalingPlan resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingScalingPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingScalingPolicy.ps1
index c513d451b..5968f64ab 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingScalingPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingScalingPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingScalingPolicy {
+function New-VSAutoScalingScalingPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScalingPolicy resource to the template
@@ -123,7 +123,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $AdjustmentType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $AutoScalingGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -159,7 +159,7 @@
         $EstimatedInstanceWarmup,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -173,7 +173,7 @@
         $MinAdjustmentMagnitude,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSAutoScalingScheduledAction.ps1 b/VaporShell/Public/Resource Types/New-VSAutoScalingScheduledAction.ps1
index 2ad521003..4ed50c137 100644
--- a/VaporShell/Public/Resource Types/New-VSAutoScalingScheduledAction.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSAutoScalingScheduledAction.ps1	
@@ -1,4 +1,4 @@
-function New-VSAutoScalingScheduledAction {
+function New-VSAutoScalingScheduledAction {
     <#
     .SYNOPSIS
         Adds an AWS::AutoScaling::ScheduledAction resource to the template
@@ -103,7 +103,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -117,7 +117,7 @@
         $DesiredCapacity,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $MinSize,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $Recurrence,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSBatchComputeEnvironment.ps1 b/VaporShell/Public/Resource Types/New-VSBatchComputeEnvironment.ps1
index d415ce8f2..ce17a5668 100644
--- a/VaporShell/Public/Resource Types/New-VSBatchComputeEnvironment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSBatchComputeEnvironment.ps1	
@@ -1,4 +1,4 @@
-function New-VSBatchComputeEnvironment {
+function New-VSBatchComputeEnvironment {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::ComputeEnvironment resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $ServiceRole,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $ComputeResources,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSBatchJobDefinition.ps1 b/VaporShell/Public/Resource Types/New-VSBatchJobDefinition.ps1
index 46c720696..12b9cc3f0 100644
--- a/VaporShell/Public/Resource Types/New-VSBatchJobDefinition.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSBatchJobDefinition.ps1	
@@ -1,4 +1,4 @@
-function New-VSBatchJobDefinition {
+function New-VSBatchJobDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobDefinition resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -123,7 +123,7 @@
         $ContainerProperties,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSBatchJobQueue.ps1 b/VaporShell/Public/Resource Types/New-VSBatchJobQueue.ps1
index d59e68852..d4f4ef22d 100644
--- a/VaporShell/Public/Resource Types/New-VSBatchJobQueue.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSBatchJobQueue.ps1	
@@ -1,4 +1,4 @@
-function New-VSBatchJobQueue {
+function New-VSBatchJobQueue {
     <#
     .SYNOPSIS
         Adds an AWS::Batch::JobQueue resource to the template
@@ -100,7 +100,7 @@
         $Priority,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -111,7 +111,7 @@
         $State,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSBudgetsBudget.ps1 b/VaporShell/Public/Resource Types/New-VSBudgetsBudget.ps1
index 7befe640d..dd3b82798 100644
--- a/VaporShell/Public/Resource Types/New-VSBudgetsBudget.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSBudgetsBudget.ps1	
@@ -1,4 +1,4 @@
-function New-VSBudgetsBudget {
+function New-VSBudgetsBudget {
     <#
     .SYNOPSIS
         Adds an AWS::Budgets::Budget resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSCertificateManagerCertificate.ps1 b/VaporShell/Public/Resource Types/New-VSCertificateManagerCertificate.ps1
index 1144a8ea2..d40439dcd 100644
--- a/VaporShell/Public/Resource Types/New-VSCertificateManagerCertificate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCertificateManagerCertificate.ps1	
@@ -1,4 +1,4 @@
-function New-VSCertificateManagerCertificate {
+function New-VSCertificateManagerCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::CertificateManager::Certificate resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -132,7 +132,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloud9EnvironmentEC2.ps1 b/VaporShell/Public/Resource Types/New-VSCloud9EnvironmentEC2.ps1
index cafd6a9fa..1c47a9b58 100644
--- a/VaporShell/Public/Resource Types/New-VSCloud9EnvironmentEC2.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloud9EnvironmentEC2.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloud9EnvironmentEC2 {
+function New-VSCloud9EnvironmentEC2 {
     <#
     .SYNOPSIS
         Adds an AWS::Cloud9::EnvironmentEC2 resource to the template
@@ -115,7 +115,7 @@
         $Repositories,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $OwnerArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -140,7 +140,7 @@
         $AutomaticStopTimeMinutes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $SubnetId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +162,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFormationCustomResource.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFormationCustomResource.ps1
index 9fdb98aee..f65a16b75 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFormationCustomResource.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFormationCustomResource.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFormationCustomResource {
+function New-VSCloudFormationCustomResource {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFormation::CustomResource resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFormationStack.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFormationStack.ps1
index 0e3865cfe..abfd66d5c 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFormationStack.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFormationStack.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFormationStack {
+function New-VSCloudFormationStack {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFormation::Stack resource to the template
@@ -113,7 +113,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFormationWaitCondition.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFormationWaitCondition.ps1
index 1615cb351..f42ff2887 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFormationWaitCondition.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFormationWaitCondition.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFormationWaitCondition {
+function New-VSCloudFormationWaitCondition {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFormation::WaitCondition resource to the template
@@ -87,7 +87,7 @@
         $Count,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $Handle,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFormationWaitConditionHandle.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFormationWaitConditionHandle.ps1
index d0d7aaa89..b1ac2e74b 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFormationWaitConditionHandle.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFormationWaitConditionHandle.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFormationWaitConditionHandle {
+function New-VSCloudFormationWaitConditionHandle {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFormation::WaitConditionHandle resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFrontCloudFrontOriginAccessIdentity.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFrontCloudFrontOriginAccessIdentity.ps1
index 0252c82ea..1b3106189 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFrontCloudFrontOriginAccessIdentity.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFrontCloudFrontOriginAccessIdentity.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFrontCloudFrontOriginAccessIdentity {
+function New-VSCloudFrontCloudFrontOriginAccessIdentity {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::CloudFrontOriginAccessIdentity resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFrontDistribution.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFrontDistribution.ps1
index e7bf59cff..477079149 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFrontDistribution.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFrontDistribution.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFrontDistribution {
+function New-VSCloudFrontDistribution {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::Distribution resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSCloudFrontStreamingDistribution.ps1 b/VaporShell/Public/Resource Types/New-VSCloudFrontStreamingDistribution.ps1
index 22a0e7157..8df7b739d 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudFrontStreamingDistribution.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudFrontStreamingDistribution.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudFrontStreamingDistribution {
+function New-VSCloudFrontStreamingDistribution {
     <#
     .SYNOPSIS
         Adds an AWS::CloudFront::StreamingDistribution resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSCloudTrailTrail.ps1 b/VaporShell/Public/Resource Types/New-VSCloudTrailTrail.ps1
index ff340299f..c999d7256 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudTrailTrail.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudTrailTrail.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudTrailTrail {
+function New-VSCloudTrailTrail {
     <#
     .SYNOPSIS
         Adds an AWS::CloudTrail::Trail resource to the template
@@ -143,7 +143,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -154,7 +154,7 @@
         $CloudWatchLogsLogGroupArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -188,7 +188,7 @@
         $IsMultiRegionTrail,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -199,7 +199,7 @@
         $KMSKeyId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -210,7 +210,7 @@
         $S3BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -221,7 +221,7 @@
         $S3KeyPrefix,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -243,7 +243,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudWatchAlarm.ps1 b/VaporShell/Public/Resource Types/New-VSCloudWatchAlarm.ps1
index 7a96330aa..f910a78df 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudWatchAlarm.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudWatchAlarm.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudWatchAlarm {
+function New-VSCloudWatchAlarm {
     <#
     .SYNOPSIS
         Adds an AWS::CloudWatch::Alarm resource to the template
@@ -182,7 +182,7 @@
         $AlarmActions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -193,7 +193,7 @@
         $AlarmDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -204,7 +204,7 @@
         $AlarmName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -226,7 +226,7 @@
         $Dimensions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -240,7 +240,7 @@
         $EvaluationPeriods,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -253,7 +253,7 @@
         $InsufficientDataActions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -264,7 +264,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -280,7 +280,7 @@
         $Period,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -294,7 +294,7 @@
         $Threshold,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -305,7 +305,7 @@
         $TreatMissingData,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCloudWatchDashboard.ps1 b/VaporShell/Public/Resource Types/New-VSCloudWatchDashboard.ps1
index d6d5023bf..152bb699c 100644
--- a/VaporShell/Public/Resource Types/New-VSCloudWatchDashboard.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCloudWatchDashboard.ps1	
@@ -1,4 +1,4 @@
-function New-VSCloudWatchDashboard {
+function New-VSCloudWatchDashboard {
     <#
     .SYNOPSIS
         Adds an AWS::CloudWatch::Dashboard resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $DashboardName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodeBuildProject.ps1 b/VaporShell/Public/Resource Types/New-VSCodeBuildProject.ps1
index 7fe8f643e..35d47186e 100644
--- a/VaporShell/Public/Resource Types/New-VSCodeBuildProject.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodeBuildProject.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodeBuildProject {
+function New-VSCodeBuildProject {
     <#
     .SYNOPSIS
         Adds an AWS::CodeBuild::Project resource to the template
@@ -140,7 +140,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $VpcConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -168,7 +168,7 @@
         $Source,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -184,7 +184,7 @@
         $BadgeEnabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodeCommitRepository.ps1 b/VaporShell/Public/Resource Types/New-VSCodeCommitRepository.ps1
index 0bab9ee6b..5424d8cfb 100644
--- a/VaporShell/Public/Resource Types/New-VSCodeCommitRepository.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodeCommitRepository.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodeCommitRepository {
+function New-VSCodeCommitRepository {
     <#
     .SYNOPSIS
         Adds an AWS::CodeCommit::Repository resource to the template
@@ -80,7 +80,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Triggers,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodeDeployApplication.ps1 b/VaporShell/Public/Resource Types/New-VSCodeDeployApplication.ps1
index c1e9760e9..4e28cdf0f 100644
--- a/VaporShell/Public/Resource Types/New-VSCodeDeployApplication.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodeDeployApplication.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodeDeployApplication {
+function New-VSCodeDeployApplication {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::Application resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $ApplicationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentConfig.ps1 b/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentConfig.ps1
index d82c486b6..f441dd358 100644
--- a/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentConfig.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentConfig.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodeDeployDeploymentConfig {
+function New-VSCodeDeployDeploymentConfig {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentConfig resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentGroup.ps1 b/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentGroup.ps1
index d086ec533..392d5d313 100644
--- a/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodeDeployDeploymentGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodeDeployDeploymentGroup {
+function New-VSCodeDeployDeploymentGroup {
     <#
     .SYNOPSIS
         Adds an AWS::CodeDeploy::DeploymentGroup resource to the template
@@ -149,7 +149,7 @@
         $AlarmConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -166,7 +166,7 @@
         $Deployment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -177,7 +177,7 @@
         $DeploymentConfigName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -214,7 +214,7 @@
         $OnPremisesInstanceTagFilters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodePipelineCustomActionType.ps1 b/VaporShell/Public/Resource Types/New-VSCodePipelineCustomActionType.ps1
index ff4ce4f57..d94e8d24d 100644
--- a/VaporShell/Public/Resource Types/New-VSCodePipelineCustomActionType.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodePipelineCustomActionType.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodePipelineCustomActionType {
+function New-VSCodePipelineCustomActionType {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::CustomActionType resource to the template
@@ -105,7 +105,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $OutputArtifactDetails,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -144,7 +144,7 @@
         $Settings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodePipelinePipeline.ps1 b/VaporShell/Public/Resource Types/New-VSCodePipelinePipeline.ps1
index 68eccbfe4..9caa85fd3 100644
--- a/VaporShell/Public/Resource Types/New-VSCodePipelinePipeline.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodePipelinePipeline.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodePipelinePipeline {
+function New-VSCodePipelinePipeline {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Pipeline resource to the template
@@ -114,7 +114,7 @@
         $DisableInboundStageTransitions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -128,7 +128,7 @@
         $RestartExecutionOnUpdate,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCodePipelineWebhook.ps1 b/VaporShell/Public/Resource Types/New-VSCodePipelineWebhook.ps1
index b2d0c6dc1..b469fc10d 100644
--- a/VaporShell/Public/Resource Types/New-VSCodePipelineWebhook.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCodePipelineWebhook.ps1	
@@ -1,4 +1,4 @@
-function New-VSCodePipelineWebhook {
+function New-VSCodePipelineWebhook {
     <#
     .SYNOPSIS
         Adds an AWS::CodePipeline::Webhook resource to the template
@@ -123,7 +123,7 @@
         $Filters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $Authentication,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $TargetPipeline,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -156,7 +156,7 @@
         $TargetAction,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoIdentityPool.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoIdentityPool.ps1
index ae9ed152d..8cadd45ee 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoIdentityPool.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoIdentityPool.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoIdentityPool {
+function New-VSCognitoIdentityPool {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPool resource to the template
@@ -148,7 +148,7 @@
         $CognitoEvents,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $CognitoStreams,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoIdentityPoolRoleAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoIdentityPoolRoleAttachment.ps1
index dbb23b994..1306c4c1a 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoIdentityPoolRoleAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoIdentityPoolRoleAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoIdentityPoolRoleAttachment {
+function New-VSCognitoIdentityPoolRoleAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::IdentityPoolRoleAttachment resource to the template
@@ -90,7 +90,7 @@
         $RoleMappings,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoUserPool.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoUserPool.ps1
index ff8af0b58..09e58ecaa 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoUserPool.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoUserPool.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoUserPool {
+function New-VSCognitoUserPool {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPool resource to the template
@@ -180,7 +180,7 @@
         $Policies,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -204,7 +204,7 @@
         $AdminCreateUserConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -215,7 +215,7 @@
         $SmsAuthenticationMessage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -226,7 +226,7 @@
         $UserPoolName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -243,7 +243,7 @@
         $AliasAttributes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -262,7 +262,7 @@
         $DeviceConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolClient.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolClient.ps1
index 97417dfd5..c6a2b146a 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolClient.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolClient.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoUserPoolClient {
+function New-VSCognitoUserPoolClient {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPoolClient resource to the template
@@ -109,7 +109,7 @@
         $GenerateSecret,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $ClientName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolGroup.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolGroup.ps1
index 6f2749b54..bc4ea0772 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoUserPoolGroup {
+function New-VSCognitoUserPoolGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPoolGroup resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $GroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $Precedence,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUser.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUser.ps1
index 9f4c328ce..fa44a67b9 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUser.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUser.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoUserPoolUser {
+function New-VSCognitoUserPoolUser {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPoolUser resource to the template
@@ -117,7 +117,7 @@
         $ValidationData,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -128,7 +128,7 @@
         $UserPoolId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $Username,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUserToGroupAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUserToGroupAttachment.ps1
index 57fea7526..fb5dd6467 100644
--- a/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUserToGroupAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSCognitoUserPoolUserToGroupAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSCognitoUserPoolUserToGroupAttachment {
+function New-VSCognitoUserPoolUserToGroupAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::Cognito::UserPoolUserToGroupAttachment resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $GroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $UserPoolId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSConfigAggregationAuthorization.ps1 b/VaporShell/Public/Resource Types/New-VSConfigAggregationAuthorization.ps1
index 8d0fedab3..57ad3004a 100644
--- a/VaporShell/Public/Resource Types/New-VSConfigAggregationAuthorization.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSConfigAggregationAuthorization.ps1	
@@ -1,4 +1,4 @@
-function New-VSConfigAggregationAuthorization {
+function New-VSConfigAggregationAuthorization {
     <#
     .SYNOPSIS
         Adds an AWS::Config::AggregationAuthorization resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $AuthorizedAccountId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSConfigConfigRule.ps1 b/VaporShell/Public/Resource Types/New-VSConfigConfigRule.ps1
index 0296fc756..707a7a4f2 100644
--- a/VaporShell/Public/Resource Types/New-VSConfigConfigRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSConfigConfigRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSConfigConfigRule {
+function New-VSConfigConfigRule {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigRule resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $ConfigRuleName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $InputParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSConfigConfigurationAggregator.ps1 b/VaporShell/Public/Resource Types/New-VSConfigConfigurationAggregator.ps1
index 4fe6d2dcf..2dd9662d1 100644
--- a/VaporShell/Public/Resource Types/New-VSConfigConfigurationAggregator.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSConfigConfigurationAggregator.ps1	
@@ -1,4 +1,4 @@
-function New-VSConfigConfigurationAggregator {
+function New-VSConfigConfigurationAggregator {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigurationAggregator resource to the template
@@ -91,7 +91,7 @@
         $AccountAggregationSources,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSConfigConfigurationRecorder.ps1 b/VaporShell/Public/Resource Types/New-VSConfigConfigurationRecorder.ps1
index 81bd4cfcf..616e22efe 100644
--- a/VaporShell/Public/Resource Types/New-VSConfigConfigurationRecorder.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSConfigConfigurationRecorder.ps1	
@@ -1,4 +1,4 @@
-function New-VSConfigConfigurationRecorder {
+function New-VSConfigConfigurationRecorder {
     <#
     .SYNOPSIS
         Adds an AWS::Config::ConfigurationRecorder resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $RecordingGroup,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSConfigDeliveryChannel.ps1 b/VaporShell/Public/Resource Types/New-VSConfigDeliveryChannel.ps1
index 599515356..9fce0cd18 100644
--- a/VaporShell/Public/Resource Types/New-VSConfigDeliveryChannel.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSConfigDeliveryChannel.ps1	
@@ -1,4 +1,4 @@
-function New-VSConfigDeliveryChannel {
+function New-VSConfigDeliveryChannel {
     <#
     .SYNOPSIS
         Adds an AWS::Config::DeliveryChannel resource to the template
@@ -93,7 +93,7 @@
         $ConfigSnapshotDeliveryProperties,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -104,7 +104,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -115,7 +115,7 @@
         $S3BucketName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $S3KeyPrefix,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDAXCluster.ps1 b/VaporShell/Public/Resource Types/New-VSDAXCluster.ps1
index a44319860..85c181e75 100644
--- a/VaporShell/Public/Resource Types/New-VSDAXCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDAXCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSDAXCluster {
+function New-VSDAXCluster {
     <#
     .SYNOPSIS
         Adds an AWS::DAX::Cluster resource to the template
@@ -12,6 +12,12 @@
     .PARAMETER LogicalId
         The logical ID must be alphanumeric (A-Za-z0-9) and unique within the template. Use the logical name to reference the resource in other parts of the template. For example, if you want to map an Amazon Elastic Block Store volume to an Amazon EC2 instance, you reference the logical IDs to associate the block stores with the instance.
 
+    .PARAMETER SSESpecification
+		Type: SSESpecification    
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification    
+		UpdateType: Immutable    
+
     .PARAMETER Description
 		Required: False    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description    
@@ -37,12 +43,6 @@
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones    
 		UpdateType: Mutable    
 
-    .PARAMETER NodeType
-		Required: True    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype    
-		PrimitiveType: String    
-		UpdateType: Immutable    
-
     .PARAMETER IAMRoleARN
 		Required: True    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn    
@@ -55,12 +55,6 @@
 		PrimitiveType: String    
 		UpdateType: Immutable    
 
-    .PARAMETER ClusterName
-		Required: False    
-		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername    
-		PrimitiveType: String    
-		UpdateType: Immutable    
-
     .PARAMETER PreferredMaintenanceWindow
 		Required: False    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow    
@@ -80,6 +74,18 @@
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids    
 		UpdateType: Mutable    
 
+    .PARAMETER NodeType
+		Required: True    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype    
+		PrimitiveType: String    
+		UpdateType: Immutable    
+
+    .PARAMETER ClusterName
+		Required: False    
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername    
+		PrimitiveType: String    
+		UpdateType: Immutable    
+
     .PARAMETER Tags
 		Required: False    
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags    
@@ -134,8 +140,10 @@
         [System.String]
         $LogicalId,
         [parameter(Mandatory = $false)]
+        $SSESpecification,
+        [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +157,7 @@
         $ReplicationFactor,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +170,7 @@
         $AvailabilityZones,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,10 +178,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $NodeType,
-        [parameter(Mandatory = $true)]
+        $IAMRoleARN,
+        [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -181,10 +189,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $IAMRoleARN,
+        $SubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -192,10 +200,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $SubnetGroupName,
+        $PreferredMaintenanceWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -203,10 +211,12 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $ClusterName,
+        $NotificationTopicARN,
         [parameter(Mandatory = $false)]
+        $SecurityGroupIds,
+        [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -214,10 +224,10 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $PreferredMaintenanceWindow,
+        $NodeType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -225,9 +235,7 @@
                     $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
                 }
             })]
-        $NotificationTopicARN,
-        [parameter(Mandatory = $false)]
-        $SecurityGroupIds,
+        $ClusterName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
                 $allowedTypes = "System.String","System.Collections.Hashtable","System.Management.Automation.PSCustomObject"
diff --git a/VaporShell/Public/Resource Types/New-VSDAXParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSDAXParameterGroup.ps1
index 90574a01d..ed63baa57 100644
--- a/VaporShell/Public/Resource Types/New-VSDAXParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDAXParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSDAXParameterGroup {
+function New-VSDAXParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::DAX::ParameterGroup resource to the template
@@ -90,7 +90,7 @@
         $ParameterNameValues,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDAXSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSDAXSubnetGroup.ps1
index dcd1d304c..a7bb2d9dd 100644
--- a/VaporShell/Public/Resource Types/New-VSDAXSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDAXSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSDAXSubnetGroup {
+function New-VSDAXSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::DAX::SubnetGroup resource to the template
@@ -80,7 +80,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSCertificate.ps1 b/VaporShell/Public/Resource Types/New-VSDMSCertificate.ps1
index 507087d32..aebd95ff2 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSCertificate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSCertificate.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSCertificate {
+function New-VSDMSCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::Certificate resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $CertificateIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $CertificatePem,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSEndpoint.ps1 b/VaporShell/Public/Resource Types/New-VSDMSEndpoint.ps1
index 5511a5c0e..f58600108 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSEndpoint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSEndpoint.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSEndpoint {
+function New-VSDMSEndpoint {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::Endpoint resource to the template
@@ -160,7 +160,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -187,7 +187,7 @@
         $S3Settings,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -200,7 +200,7 @@
         $DynamoDbSettings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -211,7 +211,7 @@
         $Username,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -222,7 +222,7 @@
         $SslMode,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -233,7 +233,7 @@
         $ServerName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -244,7 +244,7 @@
         $ExtraConnectionAttributes,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -266,7 +266,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -277,7 +277,7 @@
         $EndpointIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -288,7 +288,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSEventSubscription.ps1 b/VaporShell/Public/Resource Types/New-VSDMSEventSubscription.ps1
index dc2740825..7214d560d 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSEventSubscription.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSEventSubscription.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSEventSubscription {
+function New-VSDMSEventSubscription {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::EventSubscription resource to the template
@@ -106,7 +106,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $Enabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -133,7 +133,7 @@
         $SubscriptionName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSReplicationInstance.ps1 b/VaporShell/Public/Resource Types/New-VSDMSReplicationInstance.ps1
index 1c6deb725..5df8ee237 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSReplicationInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSReplicationInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSReplicationInstance {
+function New-VSDMSReplicationInstance {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::ReplicationInstance resource to the template
@@ -147,7 +147,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $ReplicationInstanceIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -169,7 +169,7 @@
         $EngineVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -180,7 +180,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -191,7 +191,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -205,7 +205,7 @@
         $AutoMinorVersionUpgrade,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -224,7 +224,7 @@
         $AllowMajorVersionUpgrade,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSReplicationSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSDMSReplicationSubnetGroup.ps1
index 5ea15af8e..994bf8094 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSReplicationSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSReplicationSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSReplicationSubnetGroup {
+function New-VSDMSReplicationSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::ReplicationSubnetGroup resource to the template
@@ -87,7 +87,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $ReplicationSubnetGroupDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDMSReplicationTask.ps1 b/VaporShell/Public/Resource Types/New-VSDMSReplicationTask.ps1
index 6602e471f..868a9fa16 100644
--- a/VaporShell/Public/Resource Types/New-VSDMSReplicationTask.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDMSReplicationTask.ps1	
@@ -1,4 +1,4 @@
-function New-VSDMSReplicationTask {
+function New-VSDMSReplicationTask {
     <#
     .SYNOPSIS
         Adds an AWS::DMS::ReplicationTask resource to the template
@@ -116,7 +116,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $ReplicationTaskSettings,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $TableMappings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $ReplicationTaskIdentifier,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $SourceEndpointArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -171,7 +171,7 @@
         $MigrationType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -182,7 +182,7 @@
         $TargetEndpointArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDataPipelinePipeline.ps1 b/VaporShell/Public/Resource Types/New-VSDataPipelinePipeline.ps1
index 46fa8a1e0..c4573ef52 100644
--- a/VaporShell/Public/Resource Types/New-VSDataPipelinePipeline.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDataPipelinePipeline.ps1	
@@ -1,4 +1,4 @@
-function New-VSDataPipelinePipeline {
+function New-VSDataPipelinePipeline {
     <#
     .SYNOPSIS
         Adds an AWS::DataPipeline::Pipeline resource to the template
@@ -114,7 +114,7 @@
         $Activate,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDirectoryServiceMicrosoftAD.ps1 b/VaporShell/Public/Resource Types/New-VSDirectoryServiceMicrosoftAD.ps1
index ff8f12a1b..9f7654e15 100644
--- a/VaporShell/Public/Resource Types/New-VSDirectoryServiceMicrosoftAD.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDirectoryServiceMicrosoftAD.ps1	
@@ -1,4 +1,4 @@
-function New-VSDirectoryServiceMicrosoftAD {
+function New-VSDirectoryServiceMicrosoftAD {
     <#
     .SYNOPSIS
         Adds an AWS::DirectoryService::MicrosoftAD resource to the template
@@ -108,7 +108,7 @@
         $CreateAlias,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $EnableSso,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -133,7 +133,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -144,7 +144,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDirectoryServiceSimpleAD.ps1 b/VaporShell/Public/Resource Types/New-VSDirectoryServiceSimpleAD.ps1
index 33b35103c..09fb93239 100644
--- a/VaporShell/Public/Resource Types/New-VSDirectoryServiceSimpleAD.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDirectoryServiceSimpleAD.ps1	
@@ -1,4 +1,4 @@
-function New-VSDirectoryServiceSimpleAD {
+function New-VSDirectoryServiceSimpleAD {
     <#
     .SYNOPSIS
         Adds an AWS::DirectoryService::SimpleAD resource to the template
@@ -114,7 +114,7 @@
         $CreateAlias,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -128,7 +128,7 @@
         $EnableSso,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -150,7 +150,7 @@
         $Password,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $ShortName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSDynamoDBTable.ps1 b/VaporShell/Public/Resource Types/New-VSDynamoDBTable.ps1
index f747d5dee..d102a0e69 100644
--- a/VaporShell/Public/Resource Types/New-VSDynamoDBTable.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSDynamoDBTable.ps1	
@@ -1,4 +1,4 @@
-function New-VSDynamoDBTable {
+function New-VSDynamoDBTable {
     <#
     .SYNOPSIS
         Adds an AWS::DynamoDB::Table resource to the template
@@ -189,7 +189,7 @@
         $StreamSpecification,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2CustomerGateway.ps1 b/VaporShell/Public/Resource Types/New-VSEC2CustomerGateway.ps1
index a69ecc789..3bdc3b7e2 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2CustomerGateway.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2CustomerGateway.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2CustomerGateway {
+function New-VSEC2CustomerGateway {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::CustomerGateway resource to the template
@@ -90,7 +90,7 @@
         $BgpAsn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -112,7 +112,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2DHCPOptions.ps1 b/VaporShell/Public/Resource Types/New-VSEC2DHCPOptions.ps1
index 7a3cf5e18..5a4db0d8b 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2DHCPOptions.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2DHCPOptions.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2DHCPOptions {
+function New-VSEC2DHCPOptions {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::DHCPOptions resource to the template
@@ -105,7 +105,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2EIP.ps1 b/VaporShell/Public/Resource Types/New-VSEC2EIP.ps1
index b743b5fa8..e9927371e 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2EIP.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2EIP.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2EIP {
+function New-VSEC2EIP {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::EIP resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $Domain,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2EIPAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2EIPAssociation.ps1
index b44632308..54836c80d 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2EIPAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2EIPAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2EIPAssociation {
+function New-VSEC2EIPAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::EIPAssociation resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $AllocationId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $EIP,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $InstanceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $NetworkInterfaceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2EgressOnlyInternetGateway.ps1 b/VaporShell/Public/Resource Types/New-VSEC2EgressOnlyInternetGateway.ps1
index 0d11242ba..f8a25969e 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2EgressOnlyInternetGateway.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2EgressOnlyInternetGateway.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2EgressOnlyInternetGateway {
+function New-VSEC2EgressOnlyInternetGateway {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::EgressOnlyInternetGateway resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2FlowLog.ps1 b/VaporShell/Public/Resource Types/New-VSEC2FlowLog.ps1
index 6a9b69f71..4c919cf25 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2FlowLog.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2FlowLog.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2FlowLog {
+function New-VSEC2FlowLog {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::FlowLog resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $DeliverLogsPermissionArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $LogGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $ResourceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $ResourceType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2Host.ps1 b/VaporShell/Public/Resource Types/New-VSEC2Host.ps1
index d6d28e9f5..f120b7c95 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2Host.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2Host.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2Host {
+function New-VSEC2Host {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Host resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $AutoPlacement,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2Instance.ps1 b/VaporShell/Public/Resource Types/New-VSEC2Instance.ps1
index 26b2bb460..28db8fac5 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2Instance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2Instance.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2Instance {
+function New-VSEC2Instance {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Instance resource to the template
@@ -276,7 +276,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -287,7 +287,7 @@
         $AdditionalInfo,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -298,7 +298,7 @@
         $Affinity,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -339,7 +339,7 @@
         $ElasticGpuSpecifications,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -350,7 +350,7 @@
         $HostId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -361,7 +361,7 @@
         $IamInstanceProfile,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -372,7 +372,7 @@
         $ImageId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -383,7 +383,7 @@
         $InstanceInitiatedShutdownBehavior,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -408,7 +408,7 @@
         $Ipv6Addresses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -419,7 +419,7 @@
         $KernelId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -446,7 +446,7 @@
         $NetworkInterfaces,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -457,7 +457,7 @@
         $PlacementGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -468,7 +468,7 @@
         $PrivateIpAddress,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -497,7 +497,7 @@
         $SsmAssociations,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -519,7 +519,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2InternetGateway.ps1 b/VaporShell/Public/Resource Types/New-VSEC2InternetGateway.ps1
index 00f407b2a..9cdee23ad 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2InternetGateway.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2InternetGateway.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2InternetGateway {
+function New-VSEC2InternetGateway {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::InternetGateway resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSEC2LaunchTemplate.ps1 b/VaporShell/Public/Resource Types/New-VSEC2LaunchTemplate.ps1
index 79c3dfa9f..cc0dddf0e 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2LaunchTemplate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2LaunchTemplate.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2LaunchTemplate {
+function New-VSEC2LaunchTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::LaunchTemplate resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NatGateway.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NatGateway.ps1
index 4a85ca827..1d6406c16 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NatGateway.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NatGateway.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NatGateway {
+function New-VSEC2NatGateway {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NatGateway resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $AllocationId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NetworkAcl.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NetworkAcl.ps1
index bc0ef392c..35f9f5583 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NetworkAcl.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NetworkAcl.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NetworkAcl {
+function New-VSEC2NetworkAcl {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkAcl resource to the template
@@ -86,7 +86,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NetworkAclEntry.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NetworkAclEntry.ps1
index 35affc1b2..203cdc677 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NetworkAclEntry.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NetworkAclEntry.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NetworkAclEntry {
+function New-VSEC2NetworkAclEntry {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkAclEntry resource to the template
@@ -115,7 +115,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $Icmp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $Ipv6CidrBlock,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $Protocol,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterface.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterface.ps1
index a8a1e7a9b..6f4e058f0 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterface.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterface.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NetworkInterface {
+function New-VSEC2NetworkInterface {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkInterface resource to the template
@@ -133,7 +133,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -146,7 +146,7 @@
         $GroupSet,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +162,7 @@
         $Ipv6Addresses,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -190,7 +190,7 @@
         $SourceDestCheck,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfaceAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfaceAttachment.ps1
index 5cce64c65..3e1698a05 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfaceAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfaceAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NetworkInterfaceAttachment {
+function New-VSEC2NetworkInterfaceAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkInterfaceAttachment resource to the template
@@ -88,7 +88,7 @@
         $DeleteOnTermination,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $DeviceIndex,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $InstanceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfacePermission.ps1 b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfacePermission.ps1
index 830cf5539..ec9670d2d 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfacePermission.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2NetworkInterfacePermission.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2NetworkInterfacePermission {
+function New-VSEC2NetworkInterfacePermission {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::NetworkInterfacePermission resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $AwsAccountId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $NetworkInterfaceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2PlacementGroup.ps1 b/VaporShell/Public/Resource Types/New-VSEC2PlacementGroup.ps1
index 911eb9df1..e8fd65772 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2PlacementGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2PlacementGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2PlacementGroup {
+function New-VSEC2PlacementGroup {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::PlacementGroup resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2Route.ps1 b/VaporShell/Public/Resource Types/New-VSEC2Route.ps1
index e2cbc2d18..6580bc534 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2Route.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2Route.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2Route {
+function New-VSEC2Route {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Route resource to the template
@@ -115,7 +115,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $DestinationCidrBlock,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $DestinationIpv6CidrBlock,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -148,7 +148,7 @@
         $EgressOnlyInternetGatewayId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -159,7 +159,7 @@
         $GatewayId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,7 +170,7 @@
         $InstanceId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -181,7 +181,7 @@
         $NatGatewayId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -192,7 +192,7 @@
         $NetworkInterfaceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -203,7 +203,7 @@
         $RouteTableId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2RouteTable.ps1 b/VaporShell/Public/Resource Types/New-VSEC2RouteTable.ps1
index 8fed89847..130bb52bc 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2RouteTable.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2RouteTable.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2RouteTable {
+function New-VSEC2RouteTable {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::RouteTable resource to the template
@@ -86,7 +86,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroup.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroup.ps1
index 1aced4fcb..159a121be 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SecurityGroup {
+function New-VSEC2SecurityGroup {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SecurityGroup resource to the template
@@ -103,7 +103,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -114,7 +114,7 @@
         $GroupDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupEgress.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupEgress.ps1
index 3bfb014cf..f26218fd3 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupEgress.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupEgress.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SecurityGroupEgress {
+function New-VSEC2SecurityGroupEgress {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SecurityGroupEgress resource to the template
@@ -115,7 +115,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $CidrIp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $CidrIpv6,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -148,7 +148,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -159,7 +159,7 @@
         $DestinationPrefixListId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -173,7 +173,7 @@
         $FromPort,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -184,7 +184,7 @@
         $GroupId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupIngress.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupIngress.ps1
index 016608c52..8dcf8d0ee 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SecurityGroupIngress {
+function New-VSEC2SecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SecurityGroupIngress resource to the template
@@ -127,7 +127,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $CidrIp,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $CidrIpv6,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $FromPort,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $GroupId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -185,7 +185,7 @@
         $GroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -196,7 +196,7 @@
         $IpProtocol,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -207,7 +207,7 @@
         $SourceSecurityGroupId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -218,7 +218,7 @@
         $SourceSecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SpotFleet.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SpotFleet.ps1
index 8bb7116df..207761014 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SpotFleet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SpotFleet.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SpotFleet {
+function New-VSEC2SpotFleet {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SpotFleet resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSEC2Subnet.ps1 b/VaporShell/Public/Resource Types/New-VSEC2Subnet.ps1
index d57670375..448ebe64d 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2Subnet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2Subnet.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2Subnet {
+function New-VSEC2Subnet {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Subnet resource to the template
@@ -108,7 +108,7 @@
         $AssignIpv6AddressOnCreation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $CidrBlock,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -155,7 +155,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SubnetCidrBlock.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SubnetCidrBlock.ps1
index 1fab558d0..e817959dc 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SubnetCidrBlock.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SubnetCidrBlock.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SubnetCidrBlock {
+function New-VSEC2SubnetCidrBlock {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SubnetCidrBlock resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $Ipv6CidrBlock,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SubnetNetworkAclAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SubnetNetworkAclAssociation.ps1
index e08930a32..af8104373 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SubnetNetworkAclAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SubnetNetworkAclAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SubnetNetworkAclAssociation {
+function New-VSEC2SubnetNetworkAclAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SubnetNetworkAclAssociation resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $NetworkAclId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2SubnetRouteTableAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2SubnetRouteTableAssociation.ps1
index 8a163b892..d8729687c 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2SubnetRouteTableAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2SubnetRouteTableAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2SubnetRouteTableAssociation {
+function New-VSEC2SubnetRouteTableAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::SubnetRouteTableAssociation resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $RouteTableId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2TrunkInterfaceAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2TrunkInterfaceAssociation.ps1
index 75e4c0a14..fca047f9c 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2TrunkInterfaceAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2TrunkInterfaceAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2TrunkInterfaceAssociation {
+function New-VSEC2TrunkInterfaceAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::TrunkInterfaceAssociation resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $GREKey,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPC.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPC.ps1
index aa0f6ab8d..601c267d0 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPC.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPC.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPC {
+function New-VSEC2VPC {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPC resource to the template
@@ -93,7 +93,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $EnableDnsSupport,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCCidrBlock.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCCidrBlock.ps1
index b2c412197..cfc3a31ce 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCCidrBlock.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCCidrBlock.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCCidrBlock {
+function New-VSEC2VPCCidrBlock {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCCidrBlock resource to the template
@@ -82,7 +82,7 @@
         $AmazonProvidedIpv6CidrBlock,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $CidrBlock,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCDHCPOptionsAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCDHCPOptionsAssociation.ps1
index b2d097655..f9f1e14f0 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCDHCPOptionsAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCDHCPOptionsAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCDHCPOptionsAssociation {
+function New-VSEC2VPCDHCPOptionsAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCDHCPOptionsAssociation resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $DhcpOptionsId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpoint.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpoint.ps1
index 093e40f69..f587a5ba6 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpoint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpoint.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCEndpoint {
+function New-VSEC2VPCEndpoint {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCEndpoint resource to the template
@@ -112,7 +112,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $RouteTableIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -154,7 +154,7 @@
         $SecurityGroupIds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointConnectionNotification.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointConnectionNotification.ps1
index 7e302ef42..7a22d6bf3 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointConnectionNotification.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointConnectionNotification.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCEndpointConnectionNotification {
+function New-VSEC2VPCEndpointConnectionNotification {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCEndpointConnectionNotification resource to the template
@@ -88,7 +88,7 @@
         $ConnectionEvents,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $VPCEndpointId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $ServiceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointServicePermissions.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointServicePermissions.ps1
index 813ff4c6a..72f509d8b 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointServicePermissions.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCEndpointServicePermissions.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCEndpointServicePermissions {
+function New-VSEC2VPCEndpointServicePermissions {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCEndpointServicePermissions resource to the template
@@ -76,7 +76,7 @@
         $AllowedPrincipals,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCGatewayAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCGatewayAttachment.ps1
index 5ba3ae547..8244d52f7 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCGatewayAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCGatewayAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCGatewayAttachment {
+function New-VSEC2VPCGatewayAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCGatewayAttachment resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $InternetGatewayId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $VpcId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPCPeeringConnection.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPCPeeringConnection.ps1
index a0619a63a..1c1cd2761 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPCPeeringConnection.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPCPeeringConnection.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPCPeeringConnection {
+function New-VSEC2VPCPeeringConnection {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPCPeeringConnection resource to the template
@@ -18,6 +18,12 @@
 		Required: False    
 		UpdateType: Immutable    
 
+    .PARAMETER PeerRegion
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerregion    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Immutable    
+
     .PARAMETER PeerRoleArn
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerrolearn    
 		PrimitiveType: String    
@@ -93,7 +99,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -104,7 +110,18 @@
         $PeerOwnerId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $PeerRegion,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -115,7 +132,7 @@
         $PeerRoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +154,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPNConnection.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPNConnection.ps1
index 61ceeefc0..17e266c48 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPNConnection.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPNConnection.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPNConnection {
+function New-VSEC2VPNConnection {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPNConnection resource to the template
@@ -101,7 +101,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -126,7 +126,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $Type,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPNConnectionRoute.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPNConnectionRoute.ps1
index fb5e649ac..1e305a9d0 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPNConnectionRoute.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPNConnectionRoute.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPNConnectionRoute {
+function New-VSEC2VPNConnectionRoute {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPNConnectionRoute resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $DestinationCidrBlock,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPNGateway.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPNGateway.ps1
index e2c0a960e..221f05e25 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPNGateway.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPNGateway.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPNGateway {
+function New-VSEC2VPNGateway {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPNGateway resource to the template
@@ -94,7 +94,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VPNGatewayRoutePropagation.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VPNGatewayRoutePropagation.ps1
index f2f74ec04..099805d54 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VPNGatewayRoutePropagation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VPNGatewayRoutePropagation.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VPNGatewayRoutePropagation {
+function New-VSEC2VPNGatewayRoutePropagation {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VPNGatewayRoutePropagation resource to the template
@@ -77,7 +77,7 @@
         $RouteTableIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2Volume.ps1 b/VaporShell/Public/Resource Types/New-VSEC2Volume.ps1
index 94ae3732f..9b04dafe1 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2Volume.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2Volume.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2Volume {
+function New-VSEC2Volume {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::Volume resource to the template
@@ -120,7 +120,7 @@
         $AutoEnableIO,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $Size,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -173,7 +173,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEC2VolumeAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSEC2VolumeAttachment.ps1
index 0362e0277..ceaefd209 100644
--- a/VaporShell/Public/Resource Types/New-VSEC2VolumeAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEC2VolumeAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSEC2VolumeAttachment {
+function New-VSEC2VolumeAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::EC2::VolumeAttachment resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Device,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $InstanceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSECRRepository.ps1 b/VaporShell/Public/Resource Types/New-VSECRRepository.ps1
index c1ad09141..4a4ee9709 100644
--- a/VaporShell/Public/Resource Types/New-VSECRRepository.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSECRRepository.ps1	
@@ -1,4 +1,4 @@
-function New-VSECRRepository {
+function New-VSECRRepository {
     <#
     .SYNOPSIS
         Adds an AWS::ECR::Repository resource to the template
@@ -81,7 +81,7 @@
         $LifecyclePolicy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSECSCluster.ps1 b/VaporShell/Public/Resource Types/New-VSECSCluster.ps1
index c20e93faa..d8c773bb5 100644
--- a/VaporShell/Public/Resource Types/New-VSECSCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSECSCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSECSCluster {
+function New-VSECSCluster {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Cluster resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSECSService.ps1 b/VaporShell/Public/Resource Types/New-VSECSService.ps1
index a61a02bdb..02d3509ba 100644
--- a/VaporShell/Public/Resource Types/New-VSECSService.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSECSService.ps1	
@@ -1,4 +1,4 @@
-function New-VSECSService {
+function New-VSECSService {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::Service resource to the template
@@ -153,7 +153,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,7 +172,7 @@
         $HealthCheckGracePeriodSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -218,7 +218,7 @@
         $PlacementStrategies,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -229,7 +229,7 @@
         $PlatformVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -240,7 +240,7 @@
         $Role,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -262,7 +262,7 @@
         $ServiceRegistries,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSECSTaskDefinition.ps1 b/VaporShell/Public/Resource Types/New-VSECSTaskDefinition.ps1
index eaa6ea95b..eaa100b59 100644
--- a/VaporShell/Public/Resource Types/New-VSECSTaskDefinition.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSECSTaskDefinition.ps1	
@@ -1,4 +1,4 @@
-function New-VSECSTaskDefinition {
+function New-VSECSTaskDefinition {
     <#
     .SYNOPSIS
         Adds an AWS::ECS::TaskDefinition resource to the template
@@ -140,7 +140,7 @@
         $ContainerDefinitions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $Cpu,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +162,7 @@
         $ExecutionRoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -173,7 +173,7 @@
         $Family,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -184,7 +184,7 @@
         $Memory,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -208,7 +208,7 @@
         $RequiresCompatibilities,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEFSFileSystem.ps1 b/VaporShell/Public/Resource Types/New-VSEFSFileSystem.ps1
index 3763bfd6b..4faa8707d 100644
--- a/VaporShell/Public/Resource Types/New-VSEFSFileSystem.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEFSFileSystem.ps1	
@@ -1,4 +1,4 @@
-function New-VSEFSFileSystem {
+function New-VSEFSFileSystem {
     <#
     .SYNOPSIS
         Adds an AWS::EFS::FileSystem resource to the template
@@ -38,6 +38,18 @@
 		Required: False    
 		UpdateType: Immutable    
 
+    .PARAMETER ProvisionedThroughputInMibps
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-elasticfilesystem-filesystem-provisionedthroughputinmibps    
+		PrimitiveType: Double    
+		Required: False    
+		UpdateType: Mutable    
+
+    .PARAMETER ThroughputMode
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-elasticfilesystem-filesystem-throughputmode    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Mutable    
+
     .PARAMETER DeletionPolicy
         With the DeletionPolicy attribute you can preserve or (in some cases) backup a resource when its stack is deleted. You specify a DeletionPolicy attribute for each resource that you want to control. If a resource has no DeletionPolicy attribute, AWS CloudFormation deletes the resource by default.
 
@@ -101,7 +113,7 @@
         $FileSystemTags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -112,7 +124,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -121,6 +133,20 @@
                 }
             })]
         $PerformanceMode,
+        [parameter(Mandatory = $false)]
+        [System.Double]
+        $ProvisionedThroughputInMibps,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $ThroughputMode,
         [ValidateSet("Delete","Retain","Snapshot")]
         [System.String]
         $DeletionPolicy,
diff --git a/VaporShell/Public/Resource Types/New-VSEFSMountTarget.ps1 b/VaporShell/Public/Resource Types/New-VSEFSMountTarget.ps1
index 088417118..db9f7dc9d 100644
--- a/VaporShell/Public/Resource Types/New-VSEFSMountTarget.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEFSMountTarget.ps1	
@@ -1,4 +1,4 @@
-function New-VSEFSMountTarget {
+function New-VSEFSMountTarget {
     <#
     .SYNOPSIS
         Adds an AWS::EFS::MountTarget resource to the template
@@ -87,7 +87,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $FileSystemId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -111,7 +111,7 @@
         $SecurityGroups,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEKSCluster.ps1 b/VaporShell/Public/Resource Types/New-VSEKSCluster.ps1
index 11092b566..d133dca58 100644
--- a/VaporShell/Public/Resource Types/New-VSEKSCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEKSCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSEKSCluster {
+function New-VSEKSCluster {
     <#
     .SYNOPSIS
         Adds an AWS::EKS::Cluster resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Version,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $ResourcesVpcConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEMRCluster.ps1 b/VaporShell/Public/Resource Types/New-VSEMRCluster.ps1
index b0a77fd4a..f77c0a5a1 100644
--- a/VaporShell/Public/Resource Types/New-VSEMRCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEMRCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSEMRCluster {
+function New-VSEMRCluster {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Cluster resource to the template
@@ -72,6 +72,12 @@
 		Required: True    
 		UpdateType: Immutable    
 
+    .PARAMETER KerberosAttributes
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-kerberosattributes    
+		Required: False    
+		Type: KerberosAttributes    
+		UpdateType: Immutable    
+
     .PARAMETER LogUri
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-loguri    
 		PrimitiveType: String    
@@ -193,7 +199,7 @@
         $Applications,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -226,7 +232,7 @@
         $Configurations,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -242,7 +248,7 @@
         $Instances,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -252,8 +258,10 @@
             })]
         $JobFlowRole,
         [parameter(Mandatory = $false)]
+        $KerberosAttributes,
+        [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -264,7 +272,7 @@
         $LogUri,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -275,7 +283,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -286,7 +294,7 @@
         $ReleaseLabel,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -297,7 +305,7 @@
         $ScaleDownBehavior,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -308,7 +316,7 @@
         $SecurityConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEMRInstanceFleetConfig.ps1 b/VaporShell/Public/Resource Types/New-VSEMRInstanceFleetConfig.ps1
index 7a0def4e0..4ea257436 100644
--- a/VaporShell/Public/Resource Types/New-VSEMRInstanceFleetConfig.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEMRInstanceFleetConfig.ps1	
@@ -1,4 +1,4 @@
-function New-VSEMRInstanceFleetConfig {
+function New-VSEMRInstanceFleetConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceFleetConfig resource to the template
@@ -105,7 +105,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $ClusterId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -140,7 +140,7 @@
         $LaunchSpecifications,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEMRInstanceGroupConfig.ps1 b/VaporShell/Public/Resource Types/New-VSEMRInstanceGroupConfig.ps1
index cc6576b70..a5ecd4a37 100644
--- a/VaporShell/Public/Resource Types/New-VSEMRInstanceGroupConfig.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEMRInstanceGroupConfig.ps1	
@@ -1,4 +1,4 @@
-function New-VSEMRInstanceGroupConfig {
+function New-VSEMRInstanceGroupConfig {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::InstanceGroupConfig resource to the template
@@ -125,7 +125,7 @@
         $AutoScalingPolicy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -152,7 +152,7 @@
         $InstanceCount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -163,7 +163,7 @@
         $InstanceRole,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $InstanceType,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -185,7 +185,7 @@
         $JobFlowId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -196,7 +196,7 @@
         $Market,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEMRSecurityConfiguration.ps1 b/VaporShell/Public/Resource Types/New-VSEMRSecurityConfiguration.ps1
index 8a16b5f23..5010af320 100644
--- a/VaporShell/Public/Resource Types/New-VSEMRSecurityConfiguration.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEMRSecurityConfiguration.ps1	
@@ -1,4 +1,4 @@
-function New-VSEMRSecurityConfiguration {
+function New-VSEMRSecurityConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::SecurityConfiguration resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEMRStep.ps1 b/VaporShell/Public/Resource Types/New-VSEMRStep.ps1
index b829d0fa4..8e87aca43 100644
--- a/VaporShell/Public/Resource Types/New-VSEMRStep.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEMRStep.ps1	
@@ -1,4 +1,4 @@
-function New-VSEMRStep {
+function New-VSEMRStep {
     <#
     .SYNOPSIS
         Adds an AWS::EMR::Step resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $HadoopJarStep,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $JobFlowId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheCacheCluster.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheCacheCluster.ps1
index 6b74fbf39..93336e371 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheCacheCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheCacheCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheCacheCluster {
+function New-VSElastiCacheCacheCluster {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::CacheCluster resource to the template
@@ -197,7 +197,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -211,7 +211,7 @@
         $AutoMinorVersionUpgrade,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -222,7 +222,7 @@
         $CacheNodeType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -235,7 +235,7 @@
         $CacheSecurityGroupNames,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -246,7 +246,7 @@
         $CacheSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -257,7 +257,7 @@
         $ClusterName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -268,7 +268,7 @@
         $Engine,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -279,7 +279,7 @@
         $EngineVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -296,7 +296,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -309,7 +309,7 @@
         $PreferredAvailabilityZones,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -322,7 +322,7 @@
         $SnapshotArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -336,7 +336,7 @@
         $SnapshotRetentionLimit,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheParameterGroup.ps1
index 8b277d881..d8bb76e02 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheParameterGroup {
+function New-VSElastiCacheParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::ParameterGroup resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $CacheParameterGroupFamily,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheReplicationGroup.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheReplicationGroup.ps1
index b88f15222..0464d795b 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheReplicationGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheReplicationGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheReplicationGroup {
+function New-VSElastiCacheReplicationGroup {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::ReplicationGroup resource to the template
@@ -250,7 +250,7 @@
         $AtRestEncryptionEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -267,7 +267,7 @@
         $AutomaticFailoverEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -278,7 +278,7 @@
         $CacheNodeType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -291,7 +291,7 @@
         $CacheSecurityGroupNames,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -302,7 +302,7 @@
         $CacheSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -313,7 +313,7 @@
         $Engine,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -335,7 +335,7 @@
         $NodeGroupConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -357,7 +357,7 @@
         $PreferredCacheClusterAZs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -368,7 +368,7 @@
         $PreferredMaintenanceWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -382,7 +382,7 @@
         $ReplicasPerNodeGroup,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -393,7 +393,7 @@
         $ReplicationGroupDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -408,7 +408,7 @@
         $SnapshotArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -422,7 +422,7 @@
         $SnapshotRetentionLimit,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -433,7 +433,7 @@
         $SnapshotWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroup.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroup.ps1
index 729fc46e3..f766f1b6c 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheSecurityGroup {
+function New-VSElastiCacheSecurityGroup {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::SecurityGroup resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroupIngress.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroupIngress.ps1
index bbaa28b6c..d5ad803aa 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheSecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheSecurityGroupIngress {
+function New-VSElastiCacheSecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::SecurityGroupIngress resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $CacheSecurityGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $EC2SecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElastiCacheSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSElastiCacheSubnetGroup.ps1
index 10763fc65..e3763b74a 100644
--- a/VaporShell/Public/Resource Types/New-VSElastiCacheSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElastiCacheSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSElastiCacheSubnetGroup {
+function New-VSElastiCacheSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::ElastiCache::SubnetGroup resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $CacheSubnetGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplication.ps1 b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplication.ps1
index 1b724219c..e55352769 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplication.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplication.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticBeanstalkApplication {
+function New-VSElasticBeanstalkApplication {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Application resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $ApplicationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplicationVersion.ps1 b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplicationVersion.ps1
index c04695b73..a1730beb7 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplicationVersion.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkApplicationVersion.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticBeanstalkApplicationVersion {
+function New-VSElasticBeanstalkApplicationVersion {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::ApplicationVersion resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $ApplicationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkConfigurationTemplate.ps1 b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkConfigurationTemplate.ps1
index d614d36ae..45d565764 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkConfigurationTemplate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkConfigurationTemplate.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticBeanstalkConfigurationTemplate {
+function New-VSElasticBeanstalkConfigurationTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::ConfigurationTemplate resource to the template
@@ -105,7 +105,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $ApplicationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $OptionSettings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $PlatformArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkEnvironment.ps1 b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkEnvironment.ps1
index b76df0747..1fd74f1fb 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticBeanstalkEnvironment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticBeanstalkEnvironment.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticBeanstalkEnvironment {
+function New-VSElasticBeanstalkEnvironment {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticBeanstalk::Environment resource to the template
@@ -131,7 +131,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $ApplicationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $CNAMEPrefix,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -186,7 +186,7 @@
         $OptionSettings,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -197,7 +197,7 @@
         $PlatformArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -219,7 +219,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -232,7 +232,7 @@
         $Tier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingLoadBalancer.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingLoadBalancer.ps1
index 9d61ff242..0a3e9a4f7 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingLoadBalancer.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingLoadBalancer.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingLoadBalancer {
+function New-VSElasticLoadBalancingLoadBalancer {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancing::LoadBalancer resource to the template
@@ -223,7 +223,7 @@
         $Listeners,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -245,7 +245,7 @@
         $Policies,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2Listener.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2Listener.ps1
index 03c0aaf99..3a2e97051 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2Listener.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2Listener.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingV2Listener {
+function New-VSElasticLoadBalancingV2Listener {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::Listener resource to the template
@@ -123,7 +123,7 @@
         $DefaultActions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -137,7 +137,7 @@
         $Port,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -148,7 +148,7 @@
         $Protocol,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerCertificate.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerCertificate.ps1
index 6e978db5e..735a25e7f 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerCertificate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerCertificate.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingV2ListenerCertificate {
+function New-VSElasticLoadBalancingV2ListenerCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::ListenerCertificate resource to the template
@@ -86,7 +86,7 @@
         $Certificates,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerRule.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerRule.ps1
index cf39b6420..7ad83a07e 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2ListenerRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingV2ListenerRule {
+function New-VSElasticLoadBalancingV2ListenerRule {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::ListenerRule resource to the template
@@ -111,7 +111,7 @@
         $Conditions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2LoadBalancer.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2LoadBalancer.ps1
index d9ecf4626..64a85a235 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2LoadBalancer.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2LoadBalancer.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingV2LoadBalancer {
+function New-VSElasticLoadBalancingV2LoadBalancer {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::LoadBalancer resource to the template
@@ -125,7 +125,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -147,7 +147,7 @@
         $LoadBalancerAttributes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -158,7 +158,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -195,7 +195,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2TargetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2TargetGroup.ps1
index 26339df63..cbb12e261 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2TargetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticLoadBalancingV2TargetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticLoadBalancingV2TargetGroup {
+function New-VSElasticLoadBalancingV2TargetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::ElasticLoadBalancingV2::TargetGroup resource to the template
@@ -166,7 +166,7 @@
         $HealthCheckIntervalSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -177,7 +177,7 @@
         $HealthCheckPath,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -188,7 +188,7 @@
         $HealthCheckPort,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -207,7 +207,7 @@
         $Matcher,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -221,7 +221,7 @@
         $Port,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -254,7 +254,7 @@
         $TargetGroupAttributes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -279,7 +279,7 @@
         $UnhealthyThresholdCount,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSElasticsearchDomain.ps1 b/VaporShell/Public/Resource Types/New-VSElasticsearchDomain.ps1
index dfc2282b8..a0aadbdae 100644
--- a/VaporShell/Public/Resource Types/New-VSElasticsearchDomain.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSElasticsearchDomain.ps1	
@@ -1,4 +1,4 @@
-function New-VSElasticsearchDomain {
+function New-VSElasticsearchDomain {
     <#
     .SYNOPSIS
         Adds an AWS::Elasticsearch::Domain resource to the template
@@ -139,7 +139,7 @@
         $AdvancedOptions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -154,7 +154,7 @@
         $ElasticsearchClusterConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSEventsRule.ps1 b/VaporShell/Public/Resource Types/New-VSEventsRule.ps1
index 079612604..834abc0be 100644
--- a/VaporShell/Public/Resource Types/New-VSEventsRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSEventsRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSEventsRule {
+function New-VSEventsRule {
     <#
     .SYNOPSIS
         Adds an AWS::Events::Rule resource to the template
@@ -105,7 +105,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $EventPattern,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -138,7 +138,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -149,7 +149,7 @@
         $RoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $ScheduleExpression,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGameLiftAlias.ps1 b/VaporShell/Public/Resource Types/New-VSGameLiftAlias.ps1
index 79d52191b..7ec003549 100644
--- a/VaporShell/Public/Resource Types/New-VSGameLiftAlias.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGameLiftAlias.ps1	
@@ -1,4 +1,4 @@
-function New-VSGameLiftAlias {
+function New-VSGameLiftAlias {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Alias resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGameLiftBuild.ps1 b/VaporShell/Public/Resource Types/New-VSGameLiftBuild.ps1
index 771473e11..6a04c7911 100644
--- a/VaporShell/Public/Resource Types/New-VSGameLiftBuild.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGameLiftBuild.ps1	
@@ -1,4 +1,4 @@
-function New-VSGameLiftBuild {
+function New-VSGameLiftBuild {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Build resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $StorageLocation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGameLiftFleet.ps1 b/VaporShell/Public/Resource Types/New-VSGameLiftFleet.ps1
index fb0d4afd9..0bcb5fe52 100644
--- a/VaporShell/Public/Resource Types/New-VSGameLiftFleet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGameLiftFleet.ps1	
@@ -1,4 +1,4 @@
-function New-VSGameLiftFleet {
+function New-VSGameLiftFleet {
     <#
     .SYNOPSIS
         Adds an AWS::GameLift::Fleet resource to the template
@@ -131,7 +131,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $BuildId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -167,7 +167,7 @@
         $EC2InboundPermissions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -186,7 +186,7 @@
         $MinSize,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -197,7 +197,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -208,7 +208,7 @@
         $ServerLaunchParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueClassifier.ps1 b/VaporShell/Public/Resource Types/New-VSGlueClassifier.ps1
index ea092ea4d..638c6abd8 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueClassifier.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueClassifier.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueClassifier {
+function New-VSGlueClassifier {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Classifier resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSGlueConnection.ps1 b/VaporShell/Public/Resource Types/New-VSGlueConnection.ps1
index 076cac694..4367b0b19 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueConnection.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueConnection.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueConnection {
+function New-VSGlueConnection {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Connection resource to the template
@@ -75,7 +75,7 @@
         $ConnectionInput,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueCrawler.ps1 b/VaporShell/Public/Resource Types/New-VSGlueCrawler.ps1
index 5bc0546a4..be85cda8a 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueCrawler.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueCrawler.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueCrawler {
+function New-VSGlueCrawler {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Crawler resource to the template
@@ -122,7 +122,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $Classifiers,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -148,7 +148,7 @@
         $SchemaChangePolicy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $Schedule,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -174,7 +174,7 @@
         $Targets,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -185,7 +185,7 @@
         $TablePrefix,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueDatabase.ps1 b/VaporShell/Public/Resource Types/New-VSGlueDatabase.ps1
index c2d112ee9..5894f52e8 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueDatabase.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueDatabase.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueDatabase {
+function New-VSGlueDatabase {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Database resource to the template
@@ -75,7 +75,7 @@
         $DatabaseInput,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueDevEndpoint.ps1 b/VaporShell/Public/Resource Types/New-VSGlueDevEndpoint.ps1
index 187413ca4..47ed1f4e1 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueDevEndpoint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueDevEndpoint.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueDevEndpoint {
+function New-VSGlueDevEndpoint {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::DevEndpoint resource to the template
@@ -110,7 +110,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -121,7 +121,7 @@
         $ExtraJarsS3Path,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -132,7 +132,7 @@
         $EndpointName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -146,7 +146,7 @@
         $NumberOfNodes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -157,7 +157,7 @@
         $SubnetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,7 +170,7 @@
         $SecurityGroupIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueJob.ps1 b/VaporShell/Public/Resource Types/New-VSGlueJob.ps1
index eb50348c5..44398e54e 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueJob.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueJob.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueJob {
+function New-VSGlueJob {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Job resource to the template
@@ -121,7 +121,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -148,7 +148,7 @@
         $MaxRetries,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -159,7 +159,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -177,7 +177,7 @@
         $ExecutionProperty,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGluePartition.ps1 b/VaporShell/Public/Resource Types/New-VSGluePartition.ps1
index fa15d3b20..f8af3bb63 100644
--- a/VaporShell/Public/Resource Types/New-VSGluePartition.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGluePartition.ps1	
@@ -1,4 +1,4 @@
-function New-VSGluePartition {
+function New-VSGluePartition {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Partition resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $TableName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $DatabaseName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueTable.ps1 b/VaporShell/Public/Resource Types/New-VSGlueTable.ps1
index 768bf786d..d03e9ac53 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueTable.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueTable.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueTable {
+function New-VSGlueTable {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Table resource to the template
@@ -81,7 +81,7 @@
         $TableInput,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $DatabaseName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGlueTrigger.ps1 b/VaporShell/Public/Resource Types/New-VSGlueTrigger.ps1
index 6912f7148..9f439c069 100644
--- a/VaporShell/Public/Resource Types/New-VSGlueTrigger.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGlueTrigger.ps1	
@@ -1,4 +1,4 @@
-function New-VSGlueTrigger {
+function New-VSGlueTrigger {
     <#
     .SYNOPSIS
         Adds an AWS::Glue::Trigger resource to the template
@@ -98,7 +98,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $Actions,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -142,7 +142,7 @@
         $Schedule,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyDetector.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyDetector.ps1
index 5749ee0b1..5d598e8f1 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyDetector.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyDetector.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyDetector {
+function New-VSGuardDutyDetector {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Detector resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyFilter.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyFilter.ps1
index 76096f6fd..a271155b2 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyFilter.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyFilter.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyFilter {
+function New-VSGuardDutyFilter {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Filter resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $Action,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $Rank,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyIPSet.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyIPSet.ps1
index 56f8fd8e5..d0d35ae47 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyIPSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyIPSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyIPSet {
+function New-VSGuardDutyIPSet {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::IPSet resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $Activate,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $DetectorId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyMaster.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyMaster.ps1
index 41f7eb355..a62f01396 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyMaster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyMaster.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyMaster {
+function New-VSGuardDutyMaster {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Master resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $DetectorId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $MasterId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyMember.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyMember.ps1
index acb4f61d6..a3856e8c6 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyMember.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyMember.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyMember {
+function New-VSGuardDutyMember {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::Member resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $Status,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $MemberId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $Email,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -144,7 +144,7 @@
         $DisableEmailNotification,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSGuardDutyThreatIntelSet.ps1 b/VaporShell/Public/Resource Types/New-VSGuardDutyThreatIntelSet.ps1
index 264d61827..c29f96c6f 100644
--- a/VaporShell/Public/Resource Types/New-VSGuardDutyThreatIntelSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSGuardDutyThreatIntelSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSGuardDutyThreatIntelSet {
+function New-VSGuardDutyThreatIntelSet {
     <#
     .SYNOPSIS
         Adds an AWS::GuardDuty::ThreatIntelSet resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $Activate,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $DetectorId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMAccessKey.ps1 b/VaporShell/Public/Resource Types/New-VSIAMAccessKey.ps1
index 77acccd96..0e11e3510 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMAccessKey.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMAccessKey.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMAccessKey {
+function New-VSIAMAccessKey {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::AccessKey resource to the template
@@ -82,7 +82,7 @@
         $Serial,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $Status,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMGroup.ps1 b/VaporShell/Public/Resource Types/New-VSIAMGroup.ps1
index d37fcdbbc..1312f50d6 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMGroup {
+function New-VSIAMGroup {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::Group resource to the template
@@ -89,7 +89,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $ManagedPolicyArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMInstanceProfile.ps1 b/VaporShell/Public/Resource Types/New-VSIAMInstanceProfile.ps1
index 11f3ecff3..3e51305d7 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMInstanceProfile.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMInstanceProfile.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMInstanceProfile {
+function New-VSIAMInstanceProfile {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::InstanceProfile resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $InstanceProfileName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMManagedPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSIAMManagedPolicy.ps1
index ca4363090..4b18091ef 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMManagedPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMManagedPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMManagedPolicy {
+function New-VSIAMManagedPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::ManagedPolicy resource to the template
@@ -109,7 +109,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $Groups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -133,7 +133,7 @@
         $ManagedPolicyName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSIAMPolicy.ps1
index c3d01ea0d..2bce5fb8a 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMPolicy {
+function New-VSIAMPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::Policy resource to the template
@@ -110,7 +110,7 @@
         $PolicyDocument,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMRole.ps1 b/VaporShell/Public/Resource Types/New-VSIAMRole.ps1
index e4e9c1123..e8ff6a4a3 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMRole.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMRole.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMRole {
+function New-VSIAMRole {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::Role resource to the template
@@ -117,7 +117,7 @@
         $MaxSessionDuration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $Policies,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMServiceLinkedRole.ps1 b/VaporShell/Public/Resource Types/New-VSIAMServiceLinkedRole.ps1
index 5bc6fcc38..626626ffc 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMServiceLinkedRole.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMServiceLinkedRole.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMServiceLinkedRole {
+function New-VSIAMServiceLinkedRole {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::ServiceLinkedRole resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $CustomSuffix,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMUser.ps1 b/VaporShell/Public/Resource Types/New-VSIAMUser.ps1
index a5187374b..338819b9b 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMUser.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMUser.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMUser {
+function New-VSIAMUser {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::User resource to the template
@@ -109,7 +109,7 @@
         $ManagedPolicyArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -131,7 +131,7 @@
         $Policies,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIAMUserToGroupAddition.ps1 b/VaporShell/Public/Resource Types/New-VSIAMUserToGroupAddition.ps1
index f8831b90e..969a10409 100644
--- a/VaporShell/Public/Resource Types/New-VSIAMUserToGroupAddition.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIAMUserToGroupAddition.ps1	
@@ -1,4 +1,4 @@
-function New-VSIAMUserToGroupAddition {
+function New-VSIAMUserToGroupAddition {
     <#
     .SYNOPSIS
         Adds an AWS::IAM::UserToGroupAddition resource to the template
@@ -75,7 +75,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTarget.ps1 b/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTarget.ps1
index 896ba4ffc..410cd72a8 100644
--- a/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTarget.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTarget.ps1	
@@ -1,4 +1,4 @@
-function New-VSInspectorAssessmentTarget {
+function New-VSInspectorAssessmentTarget {
     <#
     .SYNOPSIS
         Adds an AWS::Inspector::AssessmentTarget resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $AssessmentTargetName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTemplate.ps1 b/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTemplate.ps1
index 263bd3dbe..9049d9794 100644
--- a/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTemplate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSInspectorAssessmentTemplate.ps1	
@@ -1,4 +1,4 @@
-function New-VSInspectorAssessmentTemplate {
+function New-VSInspectorAssessmentTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::Inspector::AssessmentTemplate resource to the template
@@ -93,7 +93,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $DurationInSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSInspectorResourceGroup.ps1 b/VaporShell/Public/Resource Types/New-VSInspectorResourceGroup.ps1
index a4d3e21a7..f7d8d0f59 100644
--- a/VaporShell/Public/Resource Types/New-VSInspectorResourceGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSInspectorResourceGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSInspectorResourceGroup {
+function New-VSInspectorResourceGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Inspector::ResourceGroup resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSIoTCertificate.ps1 b/VaporShell/Public/Resource Types/New-VSIoTCertificate.ps1
index 4517765d6..a3b40ae3b 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTCertificate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTCertificate.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTCertificate {
+function New-VSIoTCertificate {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::Certificate resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $CertificateSigningRequest,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIoTPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSIoTPolicy.ps1
index 5081710b1..2b007c0ea 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTPolicy {
+function New-VSIoTPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::Policy resource to the template
@@ -84,7 +84,7 @@
         $PolicyDocument,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIoTPolicyPrincipalAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSIoTPolicyPrincipalAttachment.ps1
index e0d761283..32965c5a3 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTPolicyPrincipalAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTPolicyPrincipalAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTPolicyPrincipalAttachment {
+function New-VSIoTPolicyPrincipalAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::PolicyPrincipalAttachment resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $PolicyName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIoTThing.ps1 b/VaporShell/Public/Resource Types/New-VSIoTThing.ps1
index e131bbb22..bc45c12ab 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTThing.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTThing.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTThing {
+function New-VSIoTThing {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::Thing resource to the template
@@ -75,7 +75,7 @@
         $AttributePayload,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIoTThingPrincipalAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSIoTThingPrincipalAttachment.ps1
index f9b6ee49e..fdad388dd 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTThingPrincipalAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTThingPrincipalAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTThingPrincipalAttachment {
+function New-VSIoTThingPrincipalAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::ThingPrincipalAttachment resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $Principal,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSIoTTopicRule.ps1 b/VaporShell/Public/Resource Types/New-VSIoTTopicRule.ps1
index ea1cbc047..f969a3816 100644
--- a/VaporShell/Public/Resource Types/New-VSIoTTopicRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSIoTTopicRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSIoTTopicRule {
+function New-VSIoTTopicRule {
     <#
     .SYNOPSIS
         Adds an AWS::IoT::TopicRule resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKMSAlias.ps1 b/VaporShell/Public/Resource Types/New-VSKMSAlias.ps1
index 38b06151d..8e36c0c45 100644
--- a/VaporShell/Public/Resource Types/New-VSKMSAlias.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKMSAlias.ps1	
@@ -1,4 +1,4 @@
-function New-VSKMSAlias {
+function New-VSKMSAlias {
     <#
     .SYNOPSIS
         Adds an AWS::KMS::Alias resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $AliasName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKMSKey.ps1 b/VaporShell/Public/Resource Types/New-VSKMSKey.ps1
index 3a533f42f..db8a874be 100644
--- a/VaporShell/Public/Resource Types/New-VSKMSKey.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKMSKey.ps1	
@@ -1,4 +1,4 @@
-function New-VSKMSKey {
+function New-VSKMSKey {
     <#
     .SYNOPSIS
         Adds an AWS::KMS::Key resource to the template
@@ -99,7 +99,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $KeyPolicy,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplication.ps1 b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplication.ps1
index af3bbee41..6eb3981da 100644
--- a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplication.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplication.ps1	
@@ -1,4 +1,4 @@
-function New-VSKinesisAnalyticsApplication {
+function New-VSKinesisAnalyticsApplication {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::Application resource to the template
@@ -86,7 +86,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $Inputs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $ApplicationDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationOutput.ps1 b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationOutput.ps1
index 5927cbc89..941586bbc 100644
--- a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationOutput.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationOutput.ps1	
@@ -1,4 +1,4 @@
-function New-VSKinesisAnalyticsApplicationOutput {
+function New-VSKinesisAnalyticsApplicationOutput {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationOutput resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationReferenceDataSource.ps1 b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationReferenceDataSource.ps1
index 0ed6a9a67..f19378407 100644
--- a/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationReferenceDataSource.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKinesisAnalyticsApplicationReferenceDataSource.ps1	
@@ -1,4 +1,4 @@
-function New-VSKinesisAnalyticsApplicationReferenceDataSource {
+function New-VSKinesisAnalyticsApplicationReferenceDataSource {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisAnalytics::ApplicationReferenceDataSource resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKinesisFirehoseDeliveryStream.ps1 b/VaporShell/Public/Resource Types/New-VSKinesisFirehoseDeliveryStream.ps1
index b09b9e474..8a25486c8 100644
--- a/VaporShell/Public/Resource Types/New-VSKinesisFirehoseDeliveryStream.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKinesisFirehoseDeliveryStream.ps1	
@@ -1,4 +1,4 @@
-function New-VSKinesisFirehoseDeliveryStream {
+function New-VSKinesisFirehoseDeliveryStream {
     <#
     .SYNOPSIS
         Adds an AWS::KinesisFirehose::DeliveryStream resource to the template
@@ -109,7 +109,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -120,7 +120,7 @@
         $DeliveryStreamName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSKinesisStream.ps1 b/VaporShell/Public/Resource Types/New-VSKinesisStream.ps1
index d4e1f6cff..8af167255 100644
--- a/VaporShell/Public/Resource Types/New-VSKinesisStream.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSKinesisStream.ps1	
@@ -1,4 +1,4 @@
-function New-VSKinesisStream {
+function New-VSKinesisStream {
     <#
     .SYNOPSIS
         Adds an AWS::Kinesis::Stream resource to the template
@@ -93,7 +93,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLambdaAlias.ps1 b/VaporShell/Public/Resource Types/New-VSLambdaAlias.ps1
index 677e4d0f0..07c6b15ce 100644
--- a/VaporShell/Public/Resource Types/New-VSLambdaAlias.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLambdaAlias.ps1	
@@ -1,4 +1,4 @@
-function New-VSLambdaAlias {
+function New-VSLambdaAlias {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Alias resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $FunctionName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $FunctionVersion,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLambdaEventSourceMapping.ps1 b/VaporShell/Public/Resource Types/New-VSLambdaEventSourceMapping.ps1
index cd2dc9e57..32a35cb6c 100644
--- a/VaporShell/Public/Resource Types/New-VSLambdaEventSourceMapping.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLambdaEventSourceMapping.ps1	
@@ -1,4 +1,4 @@
-function New-VSLambdaEventSourceMapping {
+function New-VSLambdaEventSourceMapping {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::EventSourceMapping resource to the template
@@ -97,7 +97,7 @@
         $Enabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $EventSourceArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $FunctionName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLambdaFunction.ps1 b/VaporShell/Public/Resource Types/New-VSLambdaFunction.ps1
index 7b596d2a0..d8d75dd40 100644
--- a/VaporShell/Public/Resource Types/New-VSLambdaFunction.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLambdaFunction.ps1	
@@ -1,4 +1,4 @@
-function New-VSLambdaFunction {
+function New-VSLambdaFunction {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Function resource to the template
@@ -157,7 +157,7 @@
         $DeadLetterConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,7 +170,7 @@
         $Environment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -181,7 +181,7 @@
         $FunctionName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -192,7 +192,7 @@
         $Handler,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -209,7 +209,7 @@
         $ReservedConcurrentExecutions,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -220,7 +220,7 @@
         $Role,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLambdaPermission.ps1 b/VaporShell/Public/Resource Types/New-VSLambdaPermission.ps1
index a11cc4605..38cb52c15 100644
--- a/VaporShell/Public/Resource Types/New-VSLambdaPermission.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLambdaPermission.ps1	
@@ -1,4 +1,4 @@
-function New-VSLambdaPermission {
+function New-VSLambdaPermission {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Permission resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $Action,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $EventSourceToken,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $FunctionName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $Principal,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -152,7 +152,7 @@
         $SourceAccount,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLambdaVersion.ps1 b/VaporShell/Public/Resource Types/New-VSLambdaVersion.ps1
index 76e24417d..efafe27ab 100644
--- a/VaporShell/Public/Resource Types/New-VSLambdaVersion.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLambdaVersion.ps1	
@@ -1,4 +1,4 @@
-function New-VSLambdaVersion {
+function New-VSLambdaVersion {
     <#
     .SYNOPSIS
         Adds an AWS::Lambda::Version resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $CodeSha256,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLogsDestination.ps1 b/VaporShell/Public/Resource Types/New-VSLogsDestination.ps1
index d71092177..2e8208f9d 100644
--- a/VaporShell/Public/Resource Types/New-VSLogsDestination.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLogsDestination.ps1	
@@ -1,4 +1,4 @@
-function New-VSLogsDestination {
+function New-VSLogsDestination {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::Destination resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $DestinationName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $DestinationPolicy,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $RoleArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLogsLogGroup.ps1 b/VaporShell/Public/Resource Types/New-VSLogsLogGroup.ps1
index 10f9f6145..3c095453b 100644
--- a/VaporShell/Public/Resource Types/New-VSLogsLogGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLogsLogGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSLogsLogGroup {
+function New-VSLogsLogGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::LogGroup resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLogsLogStream.ps1 b/VaporShell/Public/Resource Types/New-VSLogsLogStream.ps1
index b795f7da6..f688e9919 100644
--- a/VaporShell/Public/Resource Types/New-VSLogsLogStream.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLogsLogStream.ps1	
@@ -1,4 +1,4 @@
-function New-VSLogsLogStream {
+function New-VSLogsLogStream {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::LogStream resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $LogGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLogsMetricFilter.ps1 b/VaporShell/Public/Resource Types/New-VSLogsMetricFilter.ps1
index 5dff34270..596f9d976 100644
--- a/VaporShell/Public/Resource Types/New-VSLogsMetricFilter.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLogsMetricFilter.ps1	
@@ -1,4 +1,4 @@
-function New-VSLogsMetricFilter {
+function New-VSLogsMetricFilter {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::MetricFilter resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $FilterPattern,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSLogsSubscriptionFilter.ps1 b/VaporShell/Public/Resource Types/New-VSLogsSubscriptionFilter.ps1
index 2e68a2117..75da7ffdb 100644
--- a/VaporShell/Public/Resource Types/New-VSLogsSubscriptionFilter.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSLogsSubscriptionFilter.ps1	
@@ -1,4 +1,4 @@
-function New-VSLogsSubscriptionFilter {
+function New-VSLogsSubscriptionFilter {
     <#
     .SYNOPSIS
         Adds an AWS::Logs::SubscriptionFilter resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $DestinationArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $FilterPattern,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $LogGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSNeptuneDBCluster.ps1 b/VaporShell/Public/Resource Types/New-VSNeptuneDBCluster.ps1
index 841cb21e7..bf225ba59 100644
--- a/VaporShell/Public/Resource Types/New-VSNeptuneDBCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSNeptuneDBCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSNeptuneDBCluster {
+function New-VSNeptuneDBCluster {
     <#
     .SYNOPSIS
         Adds an AWS::Neptune::DBCluster resource to the template
@@ -151,7 +151,7 @@
         $StorageEncrypted,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $AvailabilityZones,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -178,7 +178,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -189,7 +189,7 @@
         $DBClusterIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -203,7 +203,7 @@
         $IamAuthEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -214,7 +214,7 @@
         $DBSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -227,7 +227,7 @@
         $VpcSecurityGroupIds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSNeptuneDBClusterParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSNeptuneDBClusterParameterGroup.ps1
index a8f9258a7..7177b688b 100644
--- a/VaporShell/Public/Resource Types/New-VSNeptuneDBClusterParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSNeptuneDBClusterParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSNeptuneDBClusterParameterGroup {
+function New-VSNeptuneDBClusterParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Neptune::DBClusterParameterGroup resource to the template
@@ -92,7 +92,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -114,7 +114,7 @@
         $Parameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSNeptuneDBInstance.ps1 b/VaporShell/Public/Resource Types/New-VSNeptuneDBInstance.ps1
index 6c1a0f783..7fb4280a8 100644
--- a/VaporShell/Public/Resource Types/New-VSNeptuneDBInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSNeptuneDBInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSNeptuneDBInstance {
+function New-VSNeptuneDBInstance {
     <#
     .SYNOPSIS
         Adds an AWS::Neptune::DBInstance resource to the template
@@ -128,7 +128,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $DBParameterGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -153,7 +153,7 @@
         $AllowMajorVersionUpgrade,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -164,7 +164,7 @@
         $DBClusterIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -175,7 +175,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -189,7 +189,7 @@
         $AutoMinorVersionUpgrade,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -200,7 +200,7 @@
         $DBSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -211,7 +211,7 @@
         $DBInstanceIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSNeptuneDBParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSNeptuneDBParameterGroup.ps1
index 8e975ed4d..374eba7d3 100644
--- a/VaporShell/Public/Resource Types/New-VSNeptuneDBParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSNeptuneDBParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSNeptuneDBParameterGroup {
+function New-VSNeptuneDBParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Neptune::DBParameterGroup resource to the template
@@ -92,7 +92,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -114,7 +114,7 @@
         $Parameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSNeptuneDBSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSNeptuneDBSubnetGroup.ps1
index ba2099551..b6635af32 100644
--- a/VaporShell/Public/Resource Types/New-VSNeptuneDBSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSNeptuneDBSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSNeptuneDBSubnetGroup {
+function New-VSNeptuneDBSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Neptune::DBSubnetGroup resource to the template
@@ -87,7 +87,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $DBSubnetGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksApp.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksApp.ps1
index f49bcb0a0..976ffd41b 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksApp.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksApp.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksApp {
+function New-VSOpsWorksApp {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::App resource to the template
@@ -157,7 +157,7 @@
         $DataSources,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -184,7 +184,7 @@
         $Environment,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -195,7 +195,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -208,7 +208,7 @@
         $SslConfiguration,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -219,7 +219,7 @@
         $StackId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksElasticLoadBalancerAttachment.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksElasticLoadBalancerAttachment.ps1
index 68b9981f6..7b2c9ed72 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksElasticLoadBalancerAttachment.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksElasticLoadBalancerAttachment.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksElasticLoadBalancerAttachment {
+function New-VSOpsWorksElasticLoadBalancerAttachment {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::ElasticLoadBalancerAttachment resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $ElasticLoadBalancerName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksInstance.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksInstance.ps1
index c69aa74c5..d2b6c6a7b 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksInstance {
+function New-VSOpsWorksInstance {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Instance resource to the template
@@ -195,7 +195,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -206,7 +206,7 @@
         $AgentVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -217,7 +217,7 @@
         $AmiId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -228,7 +228,7 @@
         $Architecture,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -239,7 +239,7 @@
         $AutoScalingType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -266,7 +266,7 @@
         $ElasticIps,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -280,7 +280,7 @@
         $InstallUpdatesOnBoot,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -293,7 +293,7 @@
         $LayerIds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -304,7 +304,7 @@
         $Os,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -315,7 +315,7 @@
         $RootDeviceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -326,7 +326,7 @@
         $SshKeyName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -337,7 +337,7 @@
         $StackId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -348,7 +348,7 @@
         $SubnetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -361,7 +361,7 @@
         $TimeBasedAutoScaling,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksLayer.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksLayer.ps1
index ee6644288..8b016145a 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksLayer.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksLayer.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksLayer {
+function New-VSOpsWorksLayer {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Layer resource to the template
@@ -194,7 +194,7 @@
         $AutoAssignPublicIps,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -230,7 +230,7 @@
         $LoadBasedAutoScaling,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -243,7 +243,7 @@
         $Packages,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -254,7 +254,7 @@
         $Shortname,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -276,7 +276,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksStack.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksStack.ps1
index 37b28724c..e087d3992 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksStack.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksStack.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksStack {
+function New-VSOpsWorksStack {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Stack resource to the template
@@ -221,7 +221,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -257,7 +257,7 @@
         $CustomJson,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -268,7 +268,7 @@
         $DefaultAvailabilityZone,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -279,7 +279,7 @@
         $DefaultInstanceProfileArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -290,7 +290,7 @@
         $DefaultOs,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -301,7 +301,7 @@
         $DefaultRootDeviceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -312,7 +312,7 @@
         $DefaultSshKeyName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -323,7 +323,7 @@
         $DefaultSubnetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -345,7 +345,7 @@
         $ElasticIps,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -356,7 +356,7 @@
         $HostnameTheme,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -378,7 +378,7 @@
         $RdsDbInstances,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -389,7 +389,7 @@
         $ServiceRoleArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -417,7 +417,7 @@
         $UseOpsworksSecurityGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksUserProfile.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksUserProfile.ps1
index b064fc514..997c3c41c 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksUserProfile.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksUserProfile.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksUserProfile {
+function New-VSOpsWorksUserProfile {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::UserProfile resource to the template
@@ -88,7 +88,7 @@
         $AllowSelfManagement,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -99,7 +99,7 @@
         $IamUserArn,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $SshPublicKey,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSOpsWorksVolume.ps1 b/VaporShell/Public/Resource Types/New-VSOpsWorksVolume.ps1
index 43127d983..11a83beca 100644
--- a/VaporShell/Public/Resource Types/New-VSOpsWorksVolume.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSOpsWorksVolume.ps1	
@@ -1,4 +1,4 @@
-function New-VSOpsWorksVolume {
+function New-VSOpsWorksVolume {
     <#
     .SYNOPSIS
         Adds an AWS::OpsWorks::Volume resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $Ec2VolumeId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $MountPoint,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBCluster.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBCluster.ps1
index 5024cb5be..11b40b9cf 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBCluster {
+function New-VSRDSDBCluster {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBCluster resource to the template
@@ -188,7 +188,7 @@
         $BackupRetentionPeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -199,7 +199,7 @@
         $DBClusterIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -210,7 +210,7 @@
         $DBClusterParameterGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -221,7 +221,7 @@
         $DBSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -232,7 +232,7 @@
         $DatabaseName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -243,7 +243,7 @@
         $Engine,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -254,7 +254,7 @@
         $EngineVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -265,7 +265,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -276,7 +276,7 @@
         $MasterUserPassword,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -290,7 +290,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -301,7 +301,7 @@
         $PreferredBackupWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -312,7 +312,7 @@
         $PreferredMaintenanceWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -323,7 +323,7 @@
         $ReplicationSourceIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBClusterParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBClusterParameterGroup.ps1
index ac4ed5f60..a84339010 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBClusterParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBClusterParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBClusterParameterGroup {
+function New-VSRDSDBClusterParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBClusterParameterGroup resource to the template
@@ -87,7 +87,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBInstance.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBInstance.ps1
index 33009aa53..3da2116e3 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBInstance {
+function New-VSRDSDBInstance {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBInstance resource to the template
@@ -303,7 +303,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -320,7 +320,7 @@
         $AutoMinorVersionUpgrade,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -331,7 +331,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -342,7 +342,7 @@
         $BackupRetentionPeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -356,7 +356,7 @@
         $CopyTagsToSnapshot,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -367,7 +367,7 @@
         $DBClusterIdentifier,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -378,7 +378,7 @@
         $DBInstanceClass,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -389,7 +389,7 @@
         $DBInstanceIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -400,7 +400,7 @@
         $DBName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -413,7 +413,7 @@
         $DBSecurityGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -424,7 +424,7 @@
         $DBSnapshotIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -435,7 +435,7 @@
         $DBSubnetGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -446,7 +446,7 @@
         $Domain,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -457,7 +457,7 @@
         $DomainIAMRoleName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -468,7 +468,7 @@
         $Engine,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -482,7 +482,7 @@
         $Iops,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -493,7 +493,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -504,7 +504,7 @@
         $LicenseModel,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -515,7 +515,7 @@
         $MasterUserPassword,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -529,7 +529,7 @@
         $MonitoringInterval,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -543,7 +543,7 @@
         $MultiAZ,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -554,7 +554,7 @@
         $OptionGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -565,7 +565,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -576,7 +576,7 @@
         $PreferredBackupWindow,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -590,7 +590,7 @@
         $PubliclyAccessible,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -601,7 +601,7 @@
         $SourceDBInstanceIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -615,7 +615,7 @@
         $StorageEncrypted,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -637,7 +637,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBParameterGroup.ps1
index 2ecf18a59..8384bd54a 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBParameterGroup {
+function New-VSRDSDBParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBParameterGroup resource to the template
@@ -89,7 +89,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroup.ps1
index 6d49115a0..91a3fcaf3 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBSecurityGroup {
+function New-VSRDSDBSecurityGroup {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBSecurityGroup resource to the template
@@ -100,7 +100,7 @@
         $DBSecurityGroupIngress,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -111,7 +111,7 @@
         $EC2VpcId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroupIngress.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroupIngress.ps1
index 0e326530d..82f73115d 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBSecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBSecurityGroupIngress {
+function New-VSRDSDBSecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBSecurityGroupIngress resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $CIDRIP,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $DBSecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $EC2SecurityGroupId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $EC2SecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSDBSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRDSDBSubnetGroup.ps1
index af82af923..4806499d8 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSDBSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSDBSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSDBSubnetGroup {
+function New-VSRDSDBSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::DBSubnetGroup resource to the template
@@ -89,7 +89,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $DBSubnetGroupDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSEventSubscription.ps1 b/VaporShell/Public/Resource Types/New-VSRDSEventSubscription.ps1
index 081b9a07a..296bda0fe 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSEventSubscription.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSEventSubscription.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSEventSubscription {
+function New-VSRDSEventSubscription {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::EventSubscription resource to the template
@@ -100,7 +100,7 @@
         $EventCategories,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $SourceIds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRDSOptionGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRDSOptionGroup.ps1
index 2cec46946..384a6ef2d 100644
--- a/VaporShell/Public/Resource Types/New-VSRDSOptionGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRDSOptionGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRDSOptionGroup {
+function New-VSRDSOptionGroup {
     <#
     .SYNOPSIS
         Adds an AWS::RDS::OptionGroup resource to the template
@@ -95,7 +95,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -106,7 +106,7 @@
         $EngineName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -128,7 +128,7 @@
         $OptionConfigurations,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRedshiftCluster.ps1 b/VaporShell/Public/Resource Types/New-VSRedshiftCluster.ps1
index f0f0af7eb..069d52c9b 100644
--- a/VaporShell/Public/Resource Types/New-VSRedshiftCluster.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRedshiftCluster.ps1	
@@ -1,4 +1,4 @@
-function New-VSRedshiftCluster {
+function New-VSRedshiftCluster {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::Cluster resource to the template
@@ -251,7 +251,7 @@
         $AutomatedSnapshotRetentionPeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -262,7 +262,7 @@
         $AvailabilityZone,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -273,7 +273,7 @@
         $ClusterIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -286,7 +286,7 @@
         $ClusterSecurityGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -297,7 +297,7 @@
         $ClusterSubnetGroupName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -308,7 +308,7 @@
         $ClusterType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -319,7 +319,7 @@
         $ClusterVersion,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -330,7 +330,7 @@
         $DBName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -344,7 +344,7 @@
         $Encrypted,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -355,7 +355,7 @@
         $HsmClientCertificateIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -368,7 +368,7 @@
         $IamRoles,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -381,7 +381,7 @@
         $LoggingProperties,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -392,7 +392,7 @@
         $MasterUserPassword,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -403,7 +403,7 @@
         $MasterUsername,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -417,7 +417,7 @@
         $NumberOfNodes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -431,7 +431,7 @@
         $Port,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -445,7 +445,7 @@
         $PubliclyAccessible,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -456,7 +456,7 @@
         $SnapshotClusterIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRedshiftClusterParameterGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRedshiftClusterParameterGroup.ps1
index 003e0cdd5..7e8640fb7 100644
--- a/VaporShell/Public/Resource Types/New-VSRedshiftClusterParameterGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRedshiftClusterParameterGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRedshiftClusterParameterGroup {
+function New-VSRedshiftClusterParameterGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::ClusterParameterGroup resource to the template
@@ -89,7 +89,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroup.ps1
index 98d0e647a..4c837208b 100644
--- a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRedshiftClusterSecurityGroup {
+function New-VSRedshiftClusterSecurityGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::ClusterSecurityGroup resource to the template
@@ -75,7 +75,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroupIngress.ps1 b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroupIngress.ps1
index 2ccf47c80..04d7d8ecb 100644
--- a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroupIngress.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSecurityGroupIngress.ps1	
@@ -1,4 +1,4 @@
-function New-VSRedshiftClusterSecurityGroupIngress {
+function New-VSRedshiftClusterSecurityGroupIngress {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::ClusterSecurityGroupIngress resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $CIDRIP,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $ClusterSecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $EC2SecurityGroupName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSubnetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSubnetGroup.ps1
index 19fec7c46..8729cc422 100644
--- a/VaporShell/Public/Resource Types/New-VSRedshiftClusterSubnetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRedshiftClusterSubnetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRedshiftClusterSubnetGroup {
+function New-VSRedshiftClusterSubnetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Redshift::ClusterSubnetGroup resource to the template
@@ -83,7 +83,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRoute53HealthCheck.ps1 b/VaporShell/Public/Resource Types/New-VSRoute53HealthCheck.ps1
index 523081a83..d212b60d9 100644
--- a/VaporShell/Public/Resource Types/New-VSRoute53HealthCheck.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRoute53HealthCheck.ps1	
@@ -1,4 +1,4 @@
-function New-VSRoute53HealthCheck {
+function New-VSRoute53HealthCheck {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HealthCheck resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSRoute53HostedZone.ps1 b/VaporShell/Public/Resource Types/New-VSRoute53HostedZone.ps1
index 0d330f9e1..3ce1986b8 100644
--- a/VaporShell/Public/Resource Types/New-VSRoute53HostedZone.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRoute53HostedZone.ps1	
@@ -1,4 +1,4 @@
-function New-VSRoute53HostedZone {
+function New-VSRoute53HostedZone {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::HostedZone resource to the template
@@ -108,7 +108,7 @@
         $HostedZoneTags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRoute53RecordSet.ps1 b/VaporShell/Public/Resource Types/New-VSRoute53RecordSet.ps1
index 616a8d855..26ef56af4 100644
--- a/VaporShell/Public/Resource Types/New-VSRoute53RecordSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRoute53RecordSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSRoute53RecordSet {
+function New-VSRoute53RecordSet {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSet resource to the template
@@ -149,7 +149,7 @@
         $AliasTarget,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -160,7 +160,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -173,7 +173,7 @@
         $GeoLocation,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -184,7 +184,7 @@
         $HealthCheckId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -195,7 +195,7 @@
         $HostedZoneId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -206,7 +206,7 @@
         $HostedZoneName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -217,7 +217,7 @@
         $Name,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -230,7 +230,7 @@
         $ResourceRecords,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -241,7 +241,7 @@
         $SetIdentifier,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -252,7 +252,7 @@
         $TTL,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSRoute53RecordSetGroup.ps1 b/VaporShell/Public/Resource Types/New-VSRoute53RecordSetGroup.ps1
index 4a550ad1e..fde73bfdf 100644
--- a/VaporShell/Public/Resource Types/New-VSRoute53RecordSetGroup.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSRoute53RecordSetGroup.ps1	
@@ -1,4 +1,4 @@
-function New-VSRoute53RecordSetGroup {
+function New-VSRoute53RecordSetGroup {
     <#
     .SYNOPSIS
         Adds an AWS::Route53::RecordSetGroup resource to the template
@@ -87,7 +87,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -98,7 +98,7 @@
         $Comment,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $HostedZoneId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSS3Bucket.ps1 b/VaporShell/Public/Resource Types/New-VSS3Bucket.ps1
index d071a9a82..6923d6ffe 100644
--- a/VaporShell/Public/Resource Types/New-VSS3Bucket.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSS3Bucket.ps1	
@@ -1,4 +1,4 @@
-function New-VSS3Bucket {
+function New-VSS3Bucket {
     <#
     .SYNOPSIS
         Adds an AWS::S3::Bucket resource to the template
@@ -161,7 +161,7 @@
         $AccelerateConfiguration,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -185,7 +185,7 @@
         $BucketEncryption,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSS3BucketPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSS3BucketPolicy.ps1
index 8b42507ba..aeda0a95f 100644
--- a/VaporShell/Public/Resource Types/New-VSS3BucketPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSS3BucketPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSS3BucketPolicy {
+function New-VSS3BucketPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::S3::BucketPolicy resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSDBDomain.ps1 b/VaporShell/Public/Resource Types/New-VSSDBDomain.ps1
index 28e723e56..e18329fe8 100644
--- a/VaporShell/Public/Resource Types/New-VSSDBDomain.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSDBDomain.ps1	
@@ -1,4 +1,4 @@
-function New-VSSDBDomain {
+function New-VSSDBDomain {
     <#
     .SYNOPSIS
         Adds an AWS::SDB::Domain resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSESConfigurationSet.ps1 b/VaporShell/Public/Resource Types/New-VSSESConfigurationSet.ps1
index 30461632e..de272d76d 100644
--- a/VaporShell/Public/Resource Types/New-VSSESConfigurationSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESConfigurationSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESConfigurationSet {
+function New-VSSESConfigurationSet {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSet resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSESConfigurationSetEventDestination.ps1 b/VaporShell/Public/Resource Types/New-VSSESConfigurationSetEventDestination.ps1
index e25cc5189..b11ddcad0 100644
--- a/VaporShell/Public/Resource Types/New-VSSESConfigurationSetEventDestination.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESConfigurationSetEventDestination.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESConfigurationSetEventDestination {
+function New-VSSESConfigurationSetEventDestination {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ConfigurationSetEventDestination resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSESReceiptFilter.ps1 b/VaporShell/Public/Resource Types/New-VSSESReceiptFilter.ps1
index a09c2b6bc..66d20a4d4 100644
--- a/VaporShell/Public/Resource Types/New-VSSESReceiptFilter.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESReceiptFilter.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESReceiptFilter {
+function New-VSSESReceiptFilter {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptFilter resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSSESReceiptRule.ps1 b/VaporShell/Public/Resource Types/New-VSSESReceiptRule.ps1
index e707855e5..aa5d1c7a9 100644
--- a/VaporShell/Public/Resource Types/New-VSSESReceiptRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESReceiptRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESReceiptRule {
+function New-VSSESReceiptRule {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRule resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $Rule,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSESReceiptRuleSet.ps1 b/VaporShell/Public/Resource Types/New-VSSESReceiptRuleSet.ps1
index 7f8d67c0c..ee8c32b91 100644
--- a/VaporShell/Public/Resource Types/New-VSSESReceiptRuleSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESReceiptRuleSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESReceiptRuleSet {
+function New-VSSESReceiptRuleSet {
     <#
     .SYNOPSIS
         Adds an AWS::SES::ReceiptRuleSet resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSESTemplate.ps1 b/VaporShell/Public/Resource Types/New-VSSESTemplate.ps1
index feea08da3..ff075301c 100644
--- a/VaporShell/Public/Resource Types/New-VSSESTemplate.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSESTemplate.ps1	
@@ -1,4 +1,4 @@
-function New-VSSESTemplate {
+function New-VSSESTemplate {
     <#
     .SYNOPSIS
         Adds an AWS::SES::Template resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSSNSSubscription.ps1 b/VaporShell/Public/Resource Types/New-VSSNSSubscription.ps1
index 299fa5cab..e9703b2a7 100644
--- a/VaporShell/Public/Resource Types/New-VSSNSSubscription.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSNSSubscription.ps1	
@@ -1,4 +1,4 @@
-function New-VSSNSSubscription {
+function New-VSSNSSubscription {
     <#
     .SYNOPSIS
         Adds an AWS::SNS::Subscription resource to the template
@@ -12,18 +12,42 @@
     .PARAMETER LogicalId
         The logical ID must be alphanumeric (A-Za-z0-9) and unique within the template. Use the logical name to reference the resource in other parts of the template. For example, if you want to map an Amazon Elastic Block Store volume to an Amazon EC2 instance, you reference the logical IDs to associate the block stores with the instance.
 
+    .PARAMETER DeliveryPolicy
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-deliverypolicy    
+		PrimitiveType: Json    
+		Required: False    
+		UpdateType: Mutable    
+
     .PARAMETER Endpoint
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-endpoint    
 		PrimitiveType: String    
 		Required: False    
 		UpdateType: Immutable    
 
+    .PARAMETER FilterPolicy
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-filterpolicy    
+		PrimitiveType: Json    
+		Required: False    
+		UpdateType: Mutable    
+
     .PARAMETER Protocol
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-protocol    
 		PrimitiveType: String    
 		Required: False    
 		UpdateType: Immutable    
 
+    .PARAMETER RawMessageDelivery
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-rawmessagedelivery    
+		PrimitiveType: Boolean    
+		Required: False    
+		UpdateType: Mutable    
+
+    .PARAMETER Region
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-region    
+		PrimitiveType: String    
+		Required: False    
+		UpdateType: Immutable    
+
     .PARAMETER TopicArn
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn    
 		PrimitiveType: String    
@@ -79,7 +103,18 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","System.Collections.Hashtable","System.Management.Automation.PSCustomObject"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $DeliveryPolicy,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +125,18 @@
         $Endpoint,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","System.Collections.Hashtable","System.Management.Automation.PSCustomObject"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $FilterPolicy,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,8 +146,22 @@
             })]
         $Protocol,
         [parameter(Mandatory = $false)]
+        [System.Boolean]
+        $RawMessageDelivery,
+        [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $Region,
+        [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -167,6 +227,40 @@
                 Condition {
                     $ResourceParams.Add("Condition",$Condition)
                 }
+                DeliveryPolicy {
+                    if (($PSBoundParameters[$key]).PSObject.TypeNames -contains "System.String"){
+                        try {
+                            $JSONObject = (ConvertFrom-Json -InputObject $PSBoundParameters[$key] -ErrorAction Stop)
+                        }
+                        catch {
+                            $PSCmdlet.ThrowTerminatingError((New-VSError -String "Unable to convert parameter '$key' string value to PSObject! Please use a JSON string OR provide a Hashtable or PSCustomObject instead!"))
+                        }
+                    }
+                    else {
+                        $JSONObject = ([PSCustomObject]$PSBoundParameters[$key])
+                    }
+                    if (!($ResourceParams["Properties"])) {
+                        $ResourceParams.Add("Properties",([PSCustomObject]@{}))
+                    }
+                    $ResourceParams["Properties"] | Add-Member -MemberType NoteProperty -Name $key -Value $JSONObject
+                }
+                FilterPolicy {
+                    if (($PSBoundParameters[$key]).PSObject.TypeNames -contains "System.String"){
+                        try {
+                            $JSONObject = (ConvertFrom-Json -InputObject $PSBoundParameters[$key] -ErrorAction Stop)
+                        }
+                        catch {
+                            $PSCmdlet.ThrowTerminatingError((New-VSError -String "Unable to convert parameter '$key' string value to PSObject! Please use a JSON string OR provide a Hashtable or PSCustomObject instead!"))
+                        }
+                    }
+                    else {
+                        $JSONObject = ([PSCustomObject]$PSBoundParameters[$key])
+                    }
+                    if (!($ResourceParams["Properties"])) {
+                        $ResourceParams.Add("Properties",([PSCustomObject]@{}))
+                    }
+                    $ResourceParams["Properties"] | Add-Member -MemberType NoteProperty -Name $key -Value $JSONObject
+                }
                 Default {
                     if (!($ResourceParams["Properties"])) {
                         $ResourceParams.Add("Properties",([PSCustomObject]@{}))
diff --git a/VaporShell/Public/Resource Types/New-VSSNSTopic.ps1 b/VaporShell/Public/Resource Types/New-VSSNSTopic.ps1
index ace4f0cf3..86a975ac6 100644
--- a/VaporShell/Public/Resource Types/New-VSSNSTopic.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSNSTopic.ps1	
@@ -1,4 +1,4 @@
-function New-VSSNSTopic {
+function New-VSSNSTopic {
     <#
     .SYNOPSIS
         Adds an AWS::SNS::Topic resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -103,7 +103,7 @@
         $Subscription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSNSTopicPolicy.ps1 b/VaporShell/Public/Resource Types/New-VSSNSTopicPolicy.ps1
index e8825abe0..dfb4a47ec 100644
--- a/VaporShell/Public/Resource Types/New-VSSNSTopicPolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSNSTopicPolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSSNSTopicPolicy {
+function New-VSSNSTopicPolicy {
     <#
     .SYNOPSIS
         Adds an AWS::SNS::TopicPolicy resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSSQSQueue.ps1 b/VaporShell/Public/Resource Types/New-VSSQSQueue.ps1
index 8e7ffbcdc..7922dd0d4 100644
--- a/VaporShell/Public/Resource Types/New-VSSQSQueue.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSQSQueue.ps1	
@@ -1,4 +1,4 @@
-function New-VSSQSQueue {
+function New-VSSQSQueue {
     <#
     .SYNOPSIS
         Adds an AWS::SQS::Queue resource to the template
@@ -72,6 +72,14 @@
 		Required: False    
 		UpdateType: Mutable    
 
+    .PARAMETER Tags
+		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#cfn-sqs-queue-tags    
+		DuplicatesAllowed: True    
+		ItemType: Tag    
+		Required: False    
+		Type: List    
+		UpdateType: Mutable    
+
     .PARAMETER VisibilityTimeout
 		Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-visiblitytimeout    
 		PrimitiveType: Integer    
@@ -139,7 +147,7 @@
         $KmsDataKeyReusePeriodSeconds,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -156,7 +164,7 @@
         $MessageRetentionPeriod,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -180,6 +188,17 @@
             })]
         $RedrivePolicy,
         [parameter(Mandatory = $false)]
+        [ValidateScript( {
+                $allowedTypes = "Vaporshell.Resource.Tag","System.Management.Automation.PSCustomObject"
+                if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
+                    $true
+                }
+                else {
+                    $PSCmdlet.ThrowTerminatingError((New-VSError -String "This parameter only accepts the following types: $($allowedTypes -join ", "). The current types of the value are: $($_.PSTypeNames -join ", ")."))
+                }
+            })]
+        $Tags,
+        [parameter(Mandatory = $false)]
         [Int]
         $VisibilityTimeout,
         [ValidateSet("Delete","Retain","Snapshot")]
@@ -239,6 +258,12 @@
                 Condition {
                     $ResourceParams.Add("Condition",$Condition)
                 }
+                Tags {
+                    if (!($ResourceParams["Properties"])) {
+                        $ResourceParams.Add("Properties",([PSCustomObject]@{}))
+                    }
+                    $ResourceParams["Properties"] | Add-Member -MemberType NoteProperty -Name Tags -Value @($Tags)
+                }
                 RedrivePolicy {
                     if (($PSBoundParameters[$key]).PSObject.TypeNames -contains "System.String"){
                         try {
diff --git a/VaporShell/Public/Resource Types/New-VSSQSQueuePolicy.ps1 b/VaporShell/Public/Resource Types/New-VSSQSQueuePolicy.ps1
index 1e6e9c4d2..51b1b5c93 100644
--- a/VaporShell/Public/Resource Types/New-VSSQSQueuePolicy.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSQSQueuePolicy.ps1	
@@ -1,4 +1,4 @@
-function New-VSSQSQueuePolicy {
+function New-VSSQSQueuePolicy {
     <#
     .SYNOPSIS
         Adds an AWS::SQS::QueuePolicy resource to the template
diff --git a/VaporShell/Public/Resource Types/New-VSSSMAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSSSMAssociation.ps1
index 33bb017d2..007cdf632 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMAssociation {
+function New-VSSSMAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Association resource to the template
@@ -113,7 +113,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $AssociationName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $DocumentVersion,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -146,7 +146,7 @@
         $InstanceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,7 +170,7 @@
         $Parameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSSMDocument.ps1 b/VaporShell/Public/Resource Types/New-VSSSMDocument.ps1
index 8f2e6c1f4..74b758a3b 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMDocument.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMDocument.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMDocument {
+function New-VSSSMDocument {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Document resource to the template
@@ -92,7 +92,7 @@
         $Content,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSSMMaintenanceWindowTask.ps1 b/VaporShell/Public/Resource Types/New-VSSSMMaintenanceWindowTask.ps1
index 3febad9fc..f6171b54c 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMMaintenanceWindowTask.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMMaintenanceWindowTask.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMMaintenanceWindowTask {
+function New-VSSSMMaintenanceWindowTask {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::MaintenanceWindowTask resource to the template
@@ -140,7 +140,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -151,7 +151,7 @@
         $MaxErrors,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -162,7 +162,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -176,7 +176,7 @@
         $Priority,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -198,7 +198,7 @@
         $Targets,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -209,7 +209,7 @@
         $Name,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -222,7 +222,7 @@
         $TaskInvocationParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -244,7 +244,7 @@
         $TaskParameters,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSSMParameter.ps1 b/VaporShell/Public/Resource Types/New-VSSSMParameter.ps1
index f97515e97..8ba20ec74 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMParameter.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMParameter.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMParameter {
+function New-VSSSMParameter {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::Parameter resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Type,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $AllowedPattern,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $Value,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSSMPatchBaseline.ps1 b/VaporShell/Public/Resource Types/New-VSSSMPatchBaseline.ps1
index 1d96742f2..7cfc6cd8c 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMPatchBaseline.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMPatchBaseline.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMPatchBaseline {
+function New-VSSSMPatchBaseline {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::PatchBaseline resource to the template
@@ -131,7 +131,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -146,7 +146,7 @@
         $PatchGroups,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -157,7 +157,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -186,7 +186,7 @@
         $Sources,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSSMResourceDataSync.ps1 b/VaporShell/Public/Resource Types/New-VSSSMResourceDataSync.ps1
index c5848f4e0..b37edd359 100644
--- a/VaporShell/Public/Resource Types/New-VSSSMResourceDataSync.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSSMResourceDataSync.ps1	
@@ -1,4 +1,4 @@
-function New-VSSSMResourceDataSync {
+function New-VSSSMResourceDataSync {
     <#
     .SYNOPSIS
         Adds an AWS::SSM::ResourceDataSync resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $KMSKeyArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -119,7 +119,7 @@
         $BucketName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -130,7 +130,7 @@
         $BucketRegion,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -141,7 +141,7 @@
         $SyncFormat,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -152,7 +152,7 @@
         $SyncName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSageMakerEndpoint.ps1 b/VaporShell/Public/Resource Types/New-VSSageMakerEndpoint.ps1
index 40c869be9..fd8e89d47 100644
--- a/VaporShell/Public/Resource Types/New-VSSageMakerEndpoint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSageMakerEndpoint.ps1	
@@ -1,4 +1,4 @@
-function New-VSSageMakerEndpoint {
+function New-VSSageMakerEndpoint {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::Endpoint resource to the template
@@ -80,7 +80,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -91,7 +91,7 @@
         $EndpointName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSageMakerEndpointConfig.ps1 b/VaporShell/Public/Resource Types/New-VSSageMakerEndpointConfig.ps1
index 98c00055a..6595078a4 100644
--- a/VaporShell/Public/Resource Types/New-VSSageMakerEndpointConfig.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSageMakerEndpointConfig.ps1	
@@ -1,4 +1,4 @@
-function New-VSSageMakerEndpointConfig {
+function New-VSSageMakerEndpointConfig {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::EndpointConfig resource to the template
@@ -98,7 +98,7 @@
         $ProductionVariants,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -109,7 +109,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSageMakerModel.ps1 b/VaporShell/Public/Resource Types/New-VSSageMakerModel.ps1
index 1a3641226..97fd2591f 100644
--- a/VaporShell/Public/Resource Types/New-VSSageMakerModel.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSageMakerModel.ps1	
@@ -1,4 +1,4 @@
-function New-VSSageMakerModel {
+function New-VSSageMakerModel {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::Model resource to the template
@@ -92,7 +92,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $PrimaryContainer,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstance.ps1 b/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstance.ps1
index d9103fa07..dabf9a574 100644
--- a/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSSageMakerNotebookInstance {
+function New-VSSageMakerNotebookInstance {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::NotebookInstance resource to the template
@@ -117,7 +117,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -128,7 +128,7 @@
         $KmsKeyId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -139,7 +139,7 @@
         $DirectInternetAccess,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -150,7 +150,7 @@
         $SubnetId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -161,7 +161,7 @@
         $NotebookInstanceName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -172,7 +172,7 @@
         $InstanceType,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -185,7 +185,7 @@
         $SecurityGroupIds,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstanceLifecycleConfig.ps1 b/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstanceLifecycleConfig.ps1
index b5acecda4..10ac43967 100644
--- a/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstanceLifecycleConfig.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSSageMakerNotebookInstanceLifecycleConfig.ps1	
@@ -1,4 +1,4 @@
-function New-VSSageMakerNotebookInstanceLifecycleConfig {
+function New-VSSageMakerNotebookInstanceLifecycleConfig {
     <#
     .SYNOPSIS
         Adds an AWS::SageMaker::NotebookInstanceLifecycleConfig resource to the template
@@ -92,7 +92,7 @@
         $OnStart,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogAcceptedPortfolioShare.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogAcceptedPortfolioShare.ps1
index fdd59444d..3998efc0f 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogAcceptedPortfolioShare.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogAcceptedPortfolioShare.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogAcceptedPortfolioShare {
+function New-VSServiceCatalogAcceptedPortfolioShare {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::AcceptedPortfolioShare resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProduct.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProduct.ps1
index c7f837f74..c42ad45da 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProduct.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProduct.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogCloudFormationProduct {
+function New-VSServiceCatalogCloudFormationProduct {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::CloudFormationProduct resource to the template
@@ -123,7 +123,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -134,7 +134,7 @@
         $Owner,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -145,7 +145,7 @@
         $SupportDescription,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -156,7 +156,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -167,7 +167,7 @@
         $Distributor,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -178,7 +178,7 @@
         $SupportEmail,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -189,7 +189,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -211,7 +211,7 @@
         $Tags,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProvisionedProduct.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProvisionedProduct.ps1
index 7407ea3ea..883bafeac 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProvisionedProduct.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogCloudFormationProvisionedProduct.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogCloudFormationProvisionedProduct {
+function New-VSServiceCatalogCloudFormationProvisionedProduct {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::CloudFormationProvisionedProduct resource to the template
@@ -124,7 +124,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -146,7 +146,7 @@
         $ProvisioningParameters,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -157,7 +157,7 @@
         $ProductName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -170,7 +170,7 @@
         $NotificationArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -181,7 +181,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -203,7 +203,7 @@
         $Tags,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -214,7 +214,7 @@
         $ProvisionedProductName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchNotificationConstraint.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchNotificationConstraint.ps1
index c852a799a..075946d74 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchNotificationConstraint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchNotificationConstraint.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogLaunchNotificationConstraint {
+function New-VSServiceCatalogLaunchNotificationConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::LaunchNotificationConstraint resource to the template
@@ -92,7 +92,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -105,7 +105,7 @@
         $NotificationArns,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -116,7 +116,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -127,7 +127,7 @@
         $PortfolioId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchRoleConstraint.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchRoleConstraint.ps1
index 6d2c6bd5e..cad54e8e6 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchRoleConstraint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchRoleConstraint.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogLaunchRoleConstraint {
+function New-VSServiceCatalogLaunchRoleConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::LaunchRoleConstraint resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $PortfolioId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $ProductId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchTemplateConstraint.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchTemplateConstraint.ps1
index f96f5ce5e..2214fa1d8 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchTemplateConstraint.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogLaunchTemplateConstraint.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogLaunchTemplateConstraint {
+function New-VSServiceCatalogLaunchTemplateConstraint {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::LaunchTemplateConstraint resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Description,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -113,7 +113,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -124,7 +124,7 @@
         $PortfolioId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -135,7 +135,7 @@
         $ProductId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolio.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolio.ps1
index 45e2cfcc3..3b2edc22c 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolio.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolio.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogPortfolio {
+function New-VSServiceCatalogPortfolio {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::Portfolio resource to the template
@@ -92,7 +92,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -103,7 +103,7 @@
         $ProviderName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -114,7 +114,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -125,7 +125,7 @@
         $DisplayName,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioPrincipalAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioPrincipalAssociation.ps1
index 58b76f7ae..56c28b5ce 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioPrincipalAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioPrincipalAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogPortfolioPrincipalAssociation {
+function New-VSServiceCatalogPortfolioPrincipalAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::PortfolioPrincipalAssociation resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $PrincipalARN,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $PortfolioId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioProductAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioProductAssociation.ps1
index 85bf73300..ae4b3ce05 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioProductAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioProductAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogPortfolioProductAssociation {
+function New-VSServiceCatalogPortfolioProductAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::PortfolioProductAssociation resource to the template
@@ -85,7 +85,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -96,7 +96,7 @@
         $SourcePortfolioId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -107,7 +107,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -118,7 +118,7 @@
         $PortfolioId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioShare.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioShare.ps1
index 03f8e15e0..cf420f27b 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioShare.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogPortfolioShare.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogPortfolioShare {
+function New-VSServiceCatalogPortfolioShare {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::PortfolioShare resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $AccountId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $AcceptLanguage,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOption.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOption.ps1
index 9616ecaf2..5464891fe 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOption.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOption.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogTagOption {
+function New-VSServiceCatalogTagOption {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::TagOption resource to the template
@@ -82,7 +82,7 @@
         $Active,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -93,7 +93,7 @@
         $Value,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOptionAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOptionAssociation.ps1
index 05e0c632f..ff4ac7003 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOptionAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceCatalogTagOptionAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceCatalogTagOptionAssociation {
+function New-VSServiceCatalogTagOptionAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceCatalog::TagOptionAssociation resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $TagOptionId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryInstance.ps1 b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryInstance.ps1
index e19266044..be47b7d71 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryInstance.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryInstance.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceDiscoveryInstance {
+function New-VSServiceDiscoveryInstance {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Instance resource to the template
@@ -90,7 +90,7 @@
         $InstanceAttributes,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $InstanceId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPrivateDnsNamespace.ps1 b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPrivateDnsNamespace.ps1
index 17491b09b..f15997593 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPrivateDnsNamespace.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPrivateDnsNamespace.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceDiscoveryPrivateDnsNamespace {
+function New-VSServiceDiscoveryPrivateDnsNamespace {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::PrivateDnsNamespace resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $Vpc,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPublicDnsNamespace.ps1 b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPublicDnsNamespace.ps1
index b6728ead9..7d9bf2343 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPublicDnsNamespace.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryPublicDnsNamespace.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceDiscoveryPublicDnsNamespace {
+function New-VSServiceDiscoveryPublicDnsNamespace {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::PublicDnsNamespace resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $Description,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryService.ps1 b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryService.ps1
index c33ce5db9..55db15711 100644
--- a/VaporShell/Public/Resource Types/New-VSServiceDiscoveryService.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSServiceDiscoveryService.ps1	
@@ -1,4 +1,4 @@
-function New-VSServiceDiscoveryService {
+function New-VSServiceDiscoveryService {
     <#
     .SYNOPSIS
         Adds an AWS::ServiceDiscovery::Service resource to the template
@@ -91,7 +91,7 @@
         $LogicalId,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $HealthCheckConfig,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSStepFunctionsActivity.ps1 b/VaporShell/Public/Resource Types/New-VSStepFunctionsActivity.ps1
index e34ed9d35..517df06a0 100644
--- a/VaporShell/Public/Resource Types/New-VSStepFunctionsActivity.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSStepFunctionsActivity.ps1	
@@ -1,4 +1,4 @@
-function New-VSStepFunctionsActivity {
+function New-VSStepFunctionsActivity {
     <#
     .SYNOPSIS
         Adds an AWS::StepFunctions::Activity resource to the template
@@ -67,7 +67,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSStepFunctionsStateMachine.ps1 b/VaporShell/Public/Resource Types/New-VSStepFunctionsStateMachine.ps1
index e952121fb..dca3c02c0 100644
--- a/VaporShell/Public/Resource Types/New-VSStepFunctionsStateMachine.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSStepFunctionsStateMachine.ps1	
@@ -1,4 +1,4 @@
-function New-VSStepFunctionsStateMachine {
+function New-VSStepFunctionsStateMachine {
     <#
     .SYNOPSIS
         Adds an AWS::StepFunctions::StateMachine resource to the template
@@ -79,7 +79,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -90,7 +90,7 @@
         $DefinitionString,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -101,7 +101,7 @@
         $StateMachineName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFByteMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFByteMatchSet.ps1
index 78368aa1d..760cc6211 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFByteMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFByteMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFByteMatchSet {
+function New-VSWAFByteMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::ByteMatchSet resource to the template
@@ -86,7 +86,7 @@
         $ByteMatchTuples,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFIPSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFIPSet.ps1
index 078c50098..92b495b6e 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFIPSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFIPSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFIPSet {
+function New-VSWAFIPSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::IPSet resource to the template
@@ -86,7 +86,7 @@
         $IPSetDescriptors,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalByteMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalByteMatchSet.ps1
index 5118f53a5..d8456d7ec 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalByteMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalByteMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalByteMatchSet {
+function New-VSWAFRegionalByteMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::ByteMatchSet resource to the template
@@ -85,7 +85,7 @@
         $ByteMatchTuples,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalIPSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalIPSet.ps1
index f3cb455a9..a04e79855 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalIPSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalIPSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalIPSet {
+function New-VSWAFRegionalIPSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::IPSet resource to the template
@@ -85,7 +85,7 @@
         $IPSetDescriptors,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalRule.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalRule.ps1
index 6a07e7091..daa03d53a 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalRule {
+function New-VSWAFRegionalRule {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::Rule resource to the template
@@ -80,7 +80,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -102,7 +102,7 @@
         $Predicates,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalSizeConstraintSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalSizeConstraintSet.ps1
index b492a7935..a04846635 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalSizeConstraintSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalSizeConstraintSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalSizeConstraintSet {
+function New-VSWAFRegionalSizeConstraintSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SizeConstraintSet resource to the template
@@ -85,7 +85,7 @@
         $SizeConstraints,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalSqlInjectionMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalSqlInjectionMatchSet.ps1
index c11b93bea..137849ed1 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalSqlInjectionMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalSqlInjectionMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalSqlInjectionMatchSet {
+function New-VSWAFRegionalSqlInjectionMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::SqlInjectionMatchSet resource to the template
@@ -85,7 +85,7 @@
         $SqlInjectionMatchTuples,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACL.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACL.ps1
index 1387c0b5d..366972e4f 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACL.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACL.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalWebACL {
+function New-VSWAFRegionalWebACL {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::WebACL resource to the template
@@ -86,7 +86,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -110,7 +110,7 @@
         $Rules,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACLAssociation.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACLAssociation.ps1
index d31251412..ce1d21340 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACLAssociation.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalWebACLAssociation.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalWebACLAssociation {
+function New-VSWAFRegionalWebACLAssociation {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::WebACLAssociation resource to the template
@@ -73,7 +73,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -84,7 +84,7 @@
         $ResourceArn,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRegionalXssMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRegionalXssMatchSet.ps1
index 994c3333f..167d737eb 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRegionalXssMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRegionalXssMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRegionalXssMatchSet {
+function New-VSWAFRegionalXssMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAFRegional::XssMatchSet resource to the template
@@ -85,7 +85,7 @@
         $XssMatchTuples,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFRule.ps1 b/VaporShell/Public/Resource Types/New-VSWAFRule.ps1
index b845f207a..bef2a3b5a 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFRule.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFRule.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFRule {
+function New-VSWAFRule {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::Rule resource to the template
@@ -81,7 +81,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -92,7 +92,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFSizeConstraintSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFSizeConstraintSet.ps1
index 180891a8c..7fd65060b 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFSizeConstraintSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFSizeConstraintSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFSizeConstraintSet {
+function New-VSWAFSizeConstraintSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SizeConstraintSet resource to the template
@@ -75,7 +75,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFSqlInjectionMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFSqlInjectionMatchSet.ps1
index 6ae8a5a06..299016da0 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFSqlInjectionMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFSqlInjectionMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFSqlInjectionMatchSet {
+function New-VSWAFSqlInjectionMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::SqlInjectionMatchSet resource to the template
@@ -75,7 +75,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFWebACL.ps1 b/VaporShell/Public/Resource Types/New-VSWAFWebACL.ps1
index 0a2759933..58f38d555 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFWebACL.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFWebACL.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFWebACL {
+function New-VSWAFWebACL {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::WebACL resource to the template
@@ -89,7 +89,7 @@
         $DefaultAction,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -100,7 +100,7 @@
         $MetricName,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWAFXssMatchSet.ps1 b/VaporShell/Public/Resource Types/New-VSWAFXssMatchSet.ps1
index 71b8fb670..01fa334e5 100644
--- a/VaporShell/Public/Resource Types/New-VSWAFXssMatchSet.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWAFXssMatchSet.ps1	
@@ -1,4 +1,4 @@
-function New-VSWAFXssMatchSet {
+function New-VSWAFXssMatchSet {
     <#
     .SYNOPSIS
         Adds an AWS::WAF::XssMatchSet resource to the template
@@ -75,7 +75,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/Public/Resource Types/New-VSWorkSpacesWorkspace.ps1 b/VaporShell/Public/Resource Types/New-VSWorkSpacesWorkspace.ps1
index d1ddfeffe..e242a497e 100644
--- a/VaporShell/Public/Resource Types/New-VSWorkSpacesWorkspace.ps1	
+++ b/VaporShell/Public/Resource Types/New-VSWorkSpacesWorkspace.ps1	
@@ -1,4 +1,4 @@
-function New-VSWorkSpacesWorkspace {
+function New-VSWorkSpacesWorkspace {
     <#
     .SYNOPSIS
         Adds an AWS::WorkSpaces::Workspace resource to the template
@@ -97,7 +97,7 @@
         $LogicalId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -108,7 +108,7 @@
         $BundleId,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -122,7 +122,7 @@
         $RootVolumeEncryptionEnabled,
         [parameter(Mandatory = $true)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
@@ -136,7 +136,7 @@
         $UserVolumeEncryptionEnabled,
         [parameter(Mandatory = $false)]
         [ValidateScript( {
-                $allowedTypes = "System.String","Vaporshell.Function"
+                $allowedTypes = "System.String","Vaporshell.Function","Vaporshell.Condition"
                 if ([string]$($_.PSTypeNames) -match "($(($allowedTypes|ForEach-Object{[RegEx]::Escape($_)}) -join '|'))") {
                     $true
                 }
diff --git a/VaporShell/VaporShell.psd1 b/VaporShell/VaporShell.psd1
index aaeb66a26..e810dd0ae 100644
--- a/VaporShell/VaporShell.psd1
+++ b/VaporShell/VaporShell.psd1
@@ -12,7 +12,7 @@
     RootModule             = 'VaporShell.psm1'
 
     # Version number of this module.
-    ModuleVersion          = '2.4.0'
+    ModuleVersion          = '2.4.1'
 
     # ID used to uniquely identify this module
     GUID                   = 'd526494c-6e59-41ff-ad05-eedbc1473b6a'