diff --git a/.gitignore b/.gitignore
index c01f3fd2f8c..7e08ef3abc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,4 +115,5 @@ amplify-migration-apps/**/_snapshot.*.actual*
 .pr-body.ai-generated.md
 .commit-message.ai-generated.txt
 .kiro-session.ai-generated.md
+.kiro/specs/
 **/.gen2-migration/refactor.operations
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/backend.ts b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/backend.ts
index f6d90a21873..4c2129d1e4d 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/backend.ts
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/backend.ts
@@ -4,12 +4,17 @@ import { storage } from './storage/resource';
 import { moodboardGetRandomEmoji } from './function/moodboardGetRandomEmoji/resource';
 import { moodboardKinesisReader } from './function/moodboardKinesisReader/resource';
 import { moodboardKinesisTrigger } from './function/moodboardKinesisTrigger/resource';
+import { CfnResolver } from 'aws-cdk-lib/aws-appsync';
 import { KinesisEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
 import { StartingPosition } from 'aws-cdk-lib/aws-lambda';
 import { Stream } from 'aws-cdk-lib/aws-kinesis';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { readdirSync } from 'fs';
 import { defineBackend } from '@aws-amplify/backend';
 import { defineAnalytics } from './analytics/resource';
-import { Duration, aws_iam } from 'aws-cdk-lib';
+import { Duration, aws_appsync, aws_iam } from 'aws-cdk-lib';
+import * as assets from 'aws-cdk-lib/aws-s3-assets';
 // import { Tags } from 'aws-cdk-lib';
 
 const backend = defineBackend({
@@ -52,6 +57,86 @@ cfnGraphqlApi.additionalAuthenticationProviders = [
     },
   },
 ];
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const resolversDir = join(__dirname, 'data/resolvers');
+const resolverFiles = readdirSync(resolversDir).filter(
+  (f) =>
+    (f.endsWith('.req.vtl') || f.endsWith('.res.vtl')) &&
+    f.split('.').length === 4
+);
+for (const file of resolverFiles) {
+  const parts = file.replace('.req.vtl', '').replace('.res.vtl', '').split('.');
+  const [typeName, fieldName] = parts;
+  const isRequest = file.endsWith('.req.vtl');
+  const functionId = `${typeName}${
+    fieldName.charAt(0).toUpperCase() + fieldName.slice(1)
+  }DataResolverFn`;
+  const pipelineFunction =
+    backend.data.resources.cfnResources.cfnFunctionConfigurations[functionId];
+  if (pipelineFunction) {
+    const templatePath = join(resolversDir, file);
+    const vtlTemplate = new assets.Asset(backend.data, `VTLTemplate-${file}`, {
+      path: templatePath,
+    });
+    if (isRequest) {
+      pipelineFunction.requestMappingTemplateS3Location =
+        vtlTemplate.s3ObjectUrl;
+    } else {
+      pipelineFunction.responseMappingTemplateS3Location =
+        vtlTemplate.s3ObjectUrl;
+    }
+  }
+}
+const noneDataSource =
+  backend.data.resources.graphqlApi.addNoneDataSource('none');
+const MutationcreateBoardinit2 = new aws_appsync.AppsyncFunction(
+  backend.data.stack,
+  'MutationcreateBoardinit2',
+  {
+    name: 'MutationcreateBoardinit2',
+    api: backend.data.resources.graphqlApi,
+    dataSource: noneDataSource,
+    requestMappingTemplate: aws_appsync.MappingTemplate.fromFile(
+      join(resolversDir, 'Mutation.createBoard.init.2.req.vtl')
+    ),
+    responseMappingTemplate: aws_appsync.MappingTemplate.fromString(
+      '$util.toJson($ctx.prev.result)'
+    ),
+  }
+);
+const MutationcreateBoardfinish1 = new aws_appsync.AppsyncFunction(
+  backend.data.stack,
+  'MutationcreateBoardfinish1',
+  {
+    name: 'MutationcreateBoardfinish1',
+    api: backend.data.resources.graphqlApi,
+    dataSource: noneDataSource,
+    requestMappingTemplate:
+      aws_appsync.MappingTemplate.fromString('$util.toJson({})'),
+    responseMappingTemplate: aws_appsync.MappingTemplate.fromFile(
+      join(resolversDir, 'Mutation.createBoard.finish.1.res.vtl')
+    ),
+  }
+);
+const mutationCreateBoardResolver = backend.data.resources.cfnResources
+  .cfnResolvers['Mutation.createBoard'] as CfnResolver;
+const mutationCreateBoardPipelineFunctions =
+  (
+    mutationCreateBoardResolver.pipelineConfig as CfnResolver.PipelineConfigProperty
+  ).functions || [];
+mutationCreateBoardPipelineFunctions.splice(
+  1,
+  0,
+  MutationcreateBoardinit2.functionId
+);
+mutationCreateBoardPipelineFunctions.splice(
+  5,
+  0,
+  MutationcreateBoardfinish1.functionId
+);
+mutationCreateBoardResolver.pipelineConfig = {
+  functions: mutationCreateBoardPipelineFunctions,
+};
 const s3Bucket = backend.storage.resources.cfnResources.cfnBucket;
 // Use this bucket name post refactor
 // s3Bucket.bucketName = 'moodboard20e29595008142e3ad16f01c4066e1c4x-x';
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.finish.1.res.vtl b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.finish.1.res.vtl
new file mode 100644
index 00000000000..d767371eafa
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.finish.1.res.vtl
@@ -0,0 +1,18 @@
+## [Start] Custom finish slot - Append "(new!)" tag to board name in response. **
+## This runs as the final step before the response is returned to the client.
+## It adds a visual indicator that the board was just created.
+
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+#if( !$util.isNullOrEmpty($ctx.prev.result) )
+  #set( $result = $ctx.prev.result )
+  #if( !$util.isNullOrEmpty($result.name) )
+    $util.qr($result.put("name", "${result.name} (new!)"))
+  #end
+  $util.toJson($result)
+#else
+  $util.toJson($ctx.prev.result)
+#end
+## [End] Custom finish slot - Append "(new!)" tag to board name in response. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.init.2.req.vtl b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.init.2.req.vtl
new file mode 100644
index 00000000000..3a6b5233573
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Mutation.createBoard.init.2.req.vtl
@@ -0,0 +1,26 @@
+## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **
+## This runs after init.1 (which sets id, createdAt, updatedAt).
+## We read the hour from createdAt and prepend a matching emoji to the board name.
+
+#set( $createdAt = $ctx.stash.defaultValues.createdAt )
+#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )
+## Convert epoch millis to approximate hour (UTC)
+#set( $hourOfDay = $hour / 3600000 % 24 )
+
+#if( $hourOfDay >= 5 && $hourOfDay < 12 )
+  #set( $emoji = "🌅" )
+#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )
+  #set( $emoji = "☀️" )
+#else
+  #set( $emoji = "🌙" )
+#end
+
+## Prepend the emoji to the board name
+#set( $inputName = $util.defaultIfNull($ctx.args.input.name, "") )
+$util.qr($ctx.stash.defaultValues.put("name", "${emoji} ${inputName}"))
+
+$util.toJson({
+  "version": "2018-05-29",
+  "payload": {}
+})
+## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.req.vtl b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.req.vtl
new file mode 100644
index 00000000000..de4c96624a5
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.req.vtl
@@ -0,0 +1,54 @@
+## [Start] Custom List Request - Override to cap results at 50. **
+#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
+#set( $limit = $util.defaultIfNull($args.limit, 50) )
+## Cap the limit at 50 to keep the board list manageable
+#if( $limit > 50 )
+  #set( $limit = 50 )
+#end
+#set( $ListRequest = {
+  "version": "2018-05-29",
+  "limit": $limit
+} )
+#if( $args.nextToken )
+  #set( $ListRequest.nextToken = $args.nextToken )
+#end
+#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
+  #set( $filter = $ctx.stash.authFilter )
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = {
+  "and":   [$filter, $args.filter]
+} )
+  #end
+#else
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = $args.filter )
+  #end
+#end
+#if( !$util.isNullOrEmpty($filter) )
+  #set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
+  #if( $util.isNullOrEmpty($filterExpression) )
+    $util.error("Unable to process the filter expression", "Unrecognized Filter")
+  #end
+  #if( !$util.isNullOrBlank($filterExpression.expression) )
+    #if( $filterExpression.expressionValues.size() == 0 )
+      $util.qr($filterExpression.remove("expressionValues"))
+    #end
+    #set( $ListRequest.filter = $filterExpression )
+  #end
+#end
+#if( !$util.isNull($ctx.stash.modelQueryExpression) && !$util.isNullOrEmpty($ctx.stash.modelQueryExpression.expression) )
+  $util.qr($ListRequest.put("operation", "Query"))
+  $util.qr($ListRequest.put("query", $ctx.stash.modelQueryExpression))
+  #if( !$util.isNull($args.sortDirection) && $args.sortDirection == "DESC" )
+    #set( $ListRequest.scanIndexForward = false )
+  #else
+    #set( $ListRequest.scanIndexForward = true )
+  #end
+#else
+  $util.qr($ListRequest.put("operation", "Scan"))
+#end
+#if( !$util.isNull($ctx.stash.metadata.index) )
+  #set( $ListRequest.IndexName = $ctx.stash.metadata.index )
+#end
+$util.toJson($ListRequest)
+## [End] Custom List Request. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.res.vtl b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.res.vtl
new file mode 100644
index 00000000000..7d06b986744
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resolvers/Query.listBoards.res.vtl
@@ -0,0 +1,14 @@
+## [Start] Custom ResponseTemplate - Prepend emoji to board names to prove override is active. **
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+## Add a pin emoji prefix to each board name so it's visible on the frontend
+#foreach( $item in $ctx.result.items )
+  #if( !$item.name.startsWith("📌 ") )
+    $util.qr($item.put("name", "📌 $item.name"))
+  #end
+#end
+
+$util.toJson($ctx.result)
+## [End] Custom ResponseTemplate. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resource.ts b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resource.ts
index a4386ed4ea3..1659dfc0a65 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resource.ts
+++ b/amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/data/resource.ts
@@ -33,9 +33,9 @@ export const data = defineData({
       //The "branchname" variable needs to be the same as your deployment branch if you want to reuse your Gen1 app tables
       branchName: 'x',
       modelNameToTableNameMapping: {
-        MoodItem: 'MoodItem-g26hrobfy5b5pniveska5ylg4u-x',
-        Board: 'Board-g26hrobfy5b5pniveska5ylg4u-x',
-        KinesisEventCount: 'KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x',
+        MoodItem: 'MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x',
+        Board: 'Board-xn3j437hmbcnfl2xxwcnmqujpy-x',
+        KinesisEventCount: 'KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x',
       },
     },
   ],
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x-holding.source.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x-holding.source.template.json
index a9002be3368..4e39ed1cdd3 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x-holding.source.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x-holding.source.template.json
@@ -19,7 +19,7 @@
         },
         "PolicyName": "moodboardKinesis-auth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -46,7 +46,7 @@
         },
         "PolicyName": "moodboardKinesis-unauth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -58,7 +58,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQqDMAwA0LP432ZdwBP4v415AKlthFhbh0knQ7z7GPt6PARsHbjG72JDTHbhEY4biVLs1Ydk/C7DkbiQsEA3lV438tmwz7891oXD5zTdVO5VX1VPU9ZIMMvljQh4BdfMwmy3WpQzwfPvF8PdMhZ3AAAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQ6CMAwA0LPwv9W5yAn4VyMHIHUrSRkbhnYSQ7i7MX69PA++deAa3MSGmOzMT9ivJEqxVwzJ4CbDnriQsEA3ll5XwmwY82/3ZebwOUw3llvVV9XDlCUSTHJ6+wucW3DNJMx2rUU5Ezz+fgEIqID2dwAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/analytics/CDKMetadata/Default"
@@ -76,7 +76,7 @@
     "kinesisStreamShardCount": {
       "Value": "1"
     },
-    "amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+    "amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
       "Value": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
     }
   },
@@ -347,10 +347,10 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.source.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.source.template.json
index fa6b3257ef7..600a0d923d4 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.source.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.source.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -54,7 +54,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -92,7 +92,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK0BP0B68iLS4llisuq26Qaa1SIh/y5Fqj3NzJsZDXpXQVWYKZbW9aWnK6QjRkHXirG9MlO8JBvuTBIgnSOOpxC8qm/884upPSHLuvqTg0MWkvdyXucmeNyLGPsYkCUrMgOkGc7DWXPOioND6OLmpTXoLVRFF4nK8clCA0Lz1Q/RUZAezgAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WZHIBxhOXoyBeDa1XXWhbBO6SkzTfzfEoJxm5s1MCWVVQJHpKeTG9rmjK8QjBkHbija90lO4ROPvTOIhngOOJ++dqm/884upHSHLuvqTg0UWkvdyXufGO9yLaPMYkCUp0gPEGc7DWVNKir1F6MLmVe5gW0GRdYEoH58sNCA0X/0AGiQi/s4AAAA="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/auth/CDKMetadata/Default"
@@ -367,20 +367,20 @@
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
-      "Value": "us-east-1_5iU0nP22B"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
+      "Value": "us-east-1_S5zs48BQ8"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref": {
-      "Value": "6dkse6kuhg779dhl6glmefrmrq"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef": {
+      "Value": "q6pv2fdcs4s7to7ocp8th73n4"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-      "Value": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+      "Value": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.target.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.target.template.json
index 61963960ba5..f62e9b8ce01 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.target.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x-holding.target.template.json
@@ -84,7 +84,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "minutes"
         },
-        "UserPoolId": "us-east-1_5iU0nP22B"
+        "UserPoolId": "us-east-1_S5zs48BQ8"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -118,7 +118,7 @@
         "SupportedIdentityProviders": [
           "COGNITO"
         ],
-        "UserPoolId": "us-east-1_5iU0nP22B"
+        "UserPoolId": "us-east-1_S5zs48BQ8"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -132,7 +132,7 @@
         "AllowUnauthenticatedIdentities": true,
         "CognitoIdentityProviders": [
           {
-            "ClientId": "6dkse6kuhg779dhl6glmefrmrq",
+            "ClientId": "q6pv2fdcs4s7to7ocp8th73n4",
             "ProviderName": {
               "Fn::Join": [
                 "",
@@ -142,7 +142,7 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_5iU0nP22B"
+                  "us-east-1_S5zs48BQ8"
                 ]
               ]
             }
@@ -173,7 +173,7 @@
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65",
+        "IdentityPoolId": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426",
         "RoleMappings": {
           "UserPoolWebClientRoleMapping": {
             "AmbiguousRoleResolution": "AuthenticatedRole",
@@ -186,9 +186,9 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_5iU0nP22B",
+                  "us-east-1_S5zs48BQ8",
                   ":",
-                  "6dkse6kuhg779dhl6glmefrmrq"
+                  "q6pv2fdcs4s7to7ocp8th73n4"
                 ]
               ]
             },
@@ -196,8 +196,8 @@
           }
         },
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.mappings.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.mappings.json
index 04e7d7ae17f..56c975c7c5d 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.mappings.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.mappings.json
@@ -2,11 +2,11 @@
   {
     "Source": {
       "StackName": "amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x",
-      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
     },
     "Destination": {
       "StackName": "amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding",
-      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
     }
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.source.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.source.template.json
index e28487715c7..3950818e952 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.source.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.source.template.json
@@ -1,10 +1,10 @@
 {
   "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"AmplifySandbox\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
   "Resources": {
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy3B9C9171": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy1D08013C": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
-        "Bucket": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+        "Bucket": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
         "PolicyDocument": {
           "Statement": [
             {
@@ -19,12 +19,12 @@
                 "AWS": "*"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -43,12 +43,12 @@
                 "AWS": "arn:aws:iam::123456789012:role/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -65,11 +65,11 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Policy/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResourceD9B4EAB6": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResource27E2B2D3": {
       "Type": "Custom::S3AutoDeleteObjects",
       "Properties": {
         "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
-        "BucketName": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "BucketName": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -123,7 +123,7 @@
             "",
             [
               "Lambda function for auto-deleting objects in ",
-              "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+              "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
               " S3 bucket."
             ]
           ]
@@ -137,24 +137,24 @@
         "aws:asset:property": "Code"
       }
     },
-    "MOODBOARD20E29595008142E3AD16F01C4066E1C47DE24GEN2DGPVVCWECQBUCKETNAMEParameterB3838DF7": {
+    "MOODBOARD20E29595008142E3AD16F01C4066E1C4AA2CCGEN2GCKKOKEZWDBUCKETNAMEParameter6DDF0413": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAME",
         "Tags": {
           "amplify:deployment-type": "sandbox",
           "created-by": "amplify"
         },
         "Type": "String",
-        "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAMEParameter/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -166,7 +166,7 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                    "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                     "/public/*"
                   ]
                 ]
@@ -183,14 +183,14 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -199,7 +199,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/amplify-moodboard-e2e-sandbox-x--storageAccess3/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -212,7 +212,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -221,7 +221,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -230,7 +230,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -245,7 +245,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -254,7 +254,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -263,7 +263,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -285,7 +285,7 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             },
             {
               "Action": "s3:DeleteObject",
@@ -295,7 +295,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -304,7 +304,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -313,7 +313,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -323,9 +323,9 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -337,7 +337,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3pxIXbNs5QrccJoSw1ldsmkWJ3G4ry31EXicKRk1/reT9qqJ8qqDb6yqXpxnKiM8RXZMGuFW1Gpa/8EXkLcT+bEUUdPl1Wp1hYupErnovf4cXPW7gjhmzdzeJfcELBt/OARrhI7yqjxk9kvtbW/P+jOwda0YIW3b06KWYLsZVArm900BYFw7Lx8yRF2kJc17NKSR1mFm+PyH4OBhe06j+oCf5CHYa9ZlQ7ZpRWdE+uT8r5DmHgh0tdQ/0I1WZgojLMTsgiHPP9BuZ0Chp6AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3p2IXbNs5QrUeEUJaaym2TSLG7gaL8d9RFonDk5Nd63o8a6l0F1UZfuTTdWE50hviMLNi1os2o9JXfI28hHmYzoqjjh8vqNRaWPskVj8Xv8OLnLdwQQ7buZ/FPOKHgy3lAI1ykN5VR4ycyX2tr/v/RnQOtaEGL7ladFLOF2Eog1zc6aIuCYdn4eZIibSGu61mlpI4zi7cnZD8Hgwta9R/UBH+hDsNBM6o9M0oruifXJ+V8hzDw3aV+gPsdVJuBicowOyGLcMr3Gy0BuPp6AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/CDKMetadata/Default"
@@ -612,16 +612,16 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref": {
-      "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+    "amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef": {
+      "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.target.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.target.template.json
index 3899a26c002..c7fbc32590e 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.target.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x-holding.target.template.json
@@ -2,7 +2,7 @@
   "AWSTemplateFormatVersion": "2010-09-09",
   "Description": "Temporary holding stack for Gen2 migration",
   "Resources": {
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketEncryption": {
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-analyticsmoodboardKinesis-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.target.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-analyticsmoodboardKinesis-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.target.template.json
index b40511815b0..3d1188b95ac 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-analyticsmoodboardKinesis-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.target.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-analyticsmoodboardKinesis-x.__to__.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.target.template.json
@@ -19,7 +19,7 @@
         },
         "PolicyName": "moodboardKinesis-auth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -46,7 +46,7 @@
         },
         "PolicyName": "moodboardKinesis-unauth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -58,7 +58,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQqDMAwA0LP432ZdwBP4v415AKlthFhbh0knQ7z7GPt6PARsHbjG72JDTHbhEY4biVLs1Ydk/C7DkbiQsEA3lV438tmwz7891oXD5zTdVO5VX1VPU9ZIMMvljQh4BdfMwmy3WpQzwfPvF8PdMhZ3AAAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQ6CMAwA0LPwv9W5yAn4VyMHIHUrSRkbhnYSQ7i7MX69PA++deAa3MSGmOzMT9ivJEqxVwzJ4CbDnriQsEA3ll5XwmwY82/3ZebwOUw3llvVV9XDlCUSTHJ6+wucW3DNJMx2rUU5Ezz+fgEIqID2dwAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/analytics/CDKMetadata/Default"
@@ -91,7 +91,7 @@
     "kinesisStreamShardCount": {
       "Value": "1"
     },
-    "amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+    "amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
       "Value": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
     }
   },
@@ -362,10 +362,10 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.source.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.source.template.json
index 5d38af0ddca..6f50dc9ef18 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.source.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.source.template.json
@@ -162,29 +162,29 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843"
+      "Value": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12"
     },
     "IdentityPoolName": {
       "Value": "moodboard759ae00a_identitypool_759ae00a__x"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_uFCFZxzU8"
+      "Value": "us-east-1_s6JCk9b66"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_uFCFZxzU8"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_s6JCk9b66"
     },
     "UserPoolName": {
       "Value": "moodboard759ae00a_userpool_759ae00a"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "74tvl72po139f1o6bp04rcs7s"
+      "Value": "7d0ivgc5sn4orr5fq46rfep64t"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "4jbh65m4dc0ipi3j8918a7d372"
+      "Value": "137ba15dh8fv20rcesjb7ocvhq"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.target.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.target.template.json
index 7ae16d2a65c..4d478eabd7a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.target.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-authmoodboard759ae00a-x.__to__.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.target.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -54,7 +54,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -92,7 +92,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK0BP0B68iLS4llisuq26Qaa1SIh/y5Fqj3NzJsZDXpXQVWYKZbW9aWnK6QjRkHXirG9MlO8JBvuTBIgnSOOpxC8qm/884upPSHLuvqTg0MWkvdyXucmeNyLGPsYkCUrMgOkGc7DWXPOioND6OLmpTXoLVRFF4nK8clCA0Lz1Q/RUZAezgAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WZHIBxhOXoyBeDa1XXWhbBO6SkzTfzfEoJxm5s1MCWVVQJHpKeTG9rmjK8QjBkHbija90lO4ROPvTOIhngOOJ++dqm/884upHSHLuvqTg0UWkvdyXufGO9yLaPMYkCUp0gPEGc7DWVNKir1F6MLmVe5gW0GRdYEoH58sNCA0X/0AGiQi/s4AAAA="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/auth/CDKMetadata/Default"
@@ -155,7 +155,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_uFCFZxzU8"
+        "UserPoolId": "us-east-1_s6JCk9b66"
       }
     },
     "amplifyAuthUserPoolNativeAppClient79534448": {
@@ -167,7 +167,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_uFCFZxzU8"
+        "UserPoolId": "us-east-1_s6JCk9b66"
       }
     },
     "amplifyAuthIdentityPool3FDE84CC": {
@@ -176,7 +176,7 @@
         "AllowUnauthenticatedIdentities": "true",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "4jbh65m4dc0ipi3j8918a7d372",
+            "ClientId": "137ba15dh8fv20rcesjb7ocvhq",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -184,13 +184,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_uFCFZxzU8"
+                  "client": "us-east-1_s6JCk9b66"
                 }
               ]
             }
           },
           {
-            "ClientId": "74tvl72po139f1o6bp04rcs7s",
+            "ClientId": "7d0ivgc5sn4orr5fq46rfep64t",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -198,7 +198,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_uFCFZxzU8"
+                  "client": "us-east-1_s6JCk9b66"
                 }
               ]
             }
@@ -218,7 +218,7 @@
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843",
+        "IdentityPoolId": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12",
         "Roles": {
           "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard-x-x-unauthRole",
           "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard-x-x-authRole"
@@ -493,20 +493,20 @@
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
-      "Value": "us-east-1_5iU0nP22B"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
+      "Value": "us-east-1_S5zs48BQ8"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref": {
-      "Value": "6dkse6kuhg779dhl6glmefrmrq"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef": {
+      "Value": "q6pv2fdcs4s7to7ocp8th73n4"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-      "Value": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+      "Value": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.mappings.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.mappings.json
index 6c6c481961e..ff9ba81d8fe 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.mappings.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.mappings.json
@@ -6,7 +6,7 @@
     },
     "Destination": {
       "StackName": "amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x",
-      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+      "LogicalResourceId": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
     }
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.target.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.target.template.json
index a6bc46836c3..0c6a3578881 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.target.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/refactor.__from__.amplify-moodboard-x-x-storagemoodboardStorage-x.__to__.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.target.template.json
@@ -1,10 +1,10 @@
 {
   "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"AmplifySandbox\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
   "Resources": {
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy3B9C9171": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy1D08013C": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
-        "Bucket": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+        "Bucket": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
         "PolicyDocument": {
           "Statement": [
             {
@@ -19,12 +19,12 @@
                 "AWS": "*"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -43,12 +43,12 @@
                 "AWS": "arn:aws:iam::123456789012:role/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -65,11 +65,11 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Policy/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResourceD9B4EAB6": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResource27E2B2D3": {
       "Type": "Custom::S3AutoDeleteObjects",
       "Properties": {
         "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
-        "BucketName": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "BucketName": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -123,7 +123,7 @@
             "",
             [
               "Lambda function for auto-deleting objects in ",
-              "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+              "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
               " S3 bucket."
             ]
           ]
@@ -137,24 +137,24 @@
         "aws:asset:property": "Code"
       }
     },
-    "MOODBOARD20E29595008142E3AD16F01C4066E1C47DE24GEN2DGPVVCWECQBUCKETNAMEParameterB3838DF7": {
+    "MOODBOARD20E29595008142E3AD16F01C4066E1C4AA2CCGEN2GCKKOKEZWDBUCKETNAMEParameter6DDF0413": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAME",
         "Tags": {
           "amplify:deployment-type": "sandbox",
           "created-by": "amplify"
         },
         "Type": "String",
-        "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAMEParameter/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -166,7 +166,7 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                    "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                     "/public/*"
                   ]
                 ]
@@ -183,14 +183,14 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -199,7 +199,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/amplify-moodboard-e2e-sandbox-x--storageAccess3/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -212,7 +212,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -221,7 +221,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -230,7 +230,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -245,7 +245,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -254,7 +254,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -263,7 +263,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -285,7 +285,7 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             },
             {
               "Action": "s3:DeleteObject",
@@ -295,7 +295,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -304,7 +304,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -313,7 +313,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -323,9 +323,9 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -337,14 +337,14 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3pxIXbNs5QrccJoSw1ldsmkWJ3G4ry31EXicKRk1/reT9qqJ8qqDb6yqXpxnKiM8RXZMGuFW1Gpa/8EXkLcT+bEUUdPl1Wp1hYupErnovf4cXPW7gjhmzdzeJfcELBt/OARrhI7yqjxk9kvtbW/P+jOwda0YIW3b06KWYLsZVArm900BYFw7Lx8yRF2kJc17NKSR1mFm+PyH4OBhe06j+oCf5CHYa9ZlQ7ZpRWdE+uT8r5DmHgh0tdQ/0I1WZgojLMTsgiHPP9BuZ0Chp6AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3p2IXbNs5QrUeEUJaaym2TSLG7gaL8d9RFonDk5Nd63o8a6l0F1UZfuTTdWE50hviMLNi1os2o9JXfI28hHmYzoqjjh8vqNRaWPskVj8Xv8OLnLdwQQ7buZ/FPOKHgy3lAI1ykN5VR4ycyX2tr/v/RnQOtaEGL7ladFLOF2Eog1zc6aIuCYdn4eZIibSGu61mlpI4zi7cnZD8Hgwta9R/UBH+hDsNBM6o9M0oruifXJ+V8hzDw3aV+gPsdVJuBicowOyGLcMr3Gy0BuPp6AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketName": {
@@ -676,16 +676,16 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref": {
-      "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+    "amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef": {
+      "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
index a1318b02429..6599fcec5a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
@@ -1,10 +1,10 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
index e4d8b790532..674c5ef8cb9 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
@@ -41,7 +41,7 @@
         },
         "PolicyName": "moodboardKinesis-auth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -68,7 +68,7 @@
         },
         "PolicyName": "moodboardKinesis-unauth-policy-gen2-x",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -80,7 +80,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQqDMAwA0LP432ZdwBP4v415AKlthFhbh0knQ7z7GPt6PARsHbjG72JDTHbhEY4biVLs1Ydk/C7DkbiQsEA3lV438tmwz7891oXD5zTdVO5VX1VPU9ZIMMvljQh4BdfMwmy3WpQzwfPvF8PdMhZ3AAAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQ6CMAwA0LPwv9W5yAn4VyMHIHUrSRkbhnYSQ7i7MX69PA++deAa3MSGmOzMT9ivJEqxVwzJ4CbDnriQsEA3ll5XwmwY82/3ZebwOUw3llvVV9XDlCUSTHJ6+wucW3DNJMx2rUU5Ezz+fgEIqID2dwAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/analytics/CDKMetadata/Default"
@@ -98,7 +98,7 @@
     "kinesisStreamShardCount": {
       "Value": "1"
     },
-    "amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+    "amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
       "Value": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
     }
   },
@@ -369,10 +369,10 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
index b1a45f63cc4..f4fcc54b412 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
@@ -83,7 +83,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "minutes"
         },
-        "UserPoolId": "us-east-1_5iU0nP22B"
+        "UserPoolId": "us-east-1_S5zs48BQ8"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -117,7 +117,7 @@
         "SupportedIdentityProviders": [
           "COGNITO"
         ],
-        "UserPoolId": "us-east-1_5iU0nP22B"
+        "UserPoolId": "us-east-1_S5zs48BQ8"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -131,7 +131,7 @@
         "AllowUnauthenticatedIdentities": true,
         "CognitoIdentityProviders": [
           {
-            "ClientId": "6dkse6kuhg779dhl6glmefrmrq",
+            "ClientId": "q6pv2fdcs4s7to7ocp8th73n4",
             "ProviderName": {
               "Fn::Join": [
                 "",
@@ -141,7 +141,7 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_5iU0nP22B"
+                  "us-east-1_S5zs48BQ8"
                 ]
               ]
             }
@@ -178,7 +178,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -222,7 +222,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -260,7 +260,7 @@
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65",
+        "IdentityPoolId": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426",
         "RoleMappings": {
           "UserPoolWebClientRoleMapping": {
             "AmbiguousRoleResolution": "AuthenticatedRole",
@@ -273,9 +273,9 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_5iU0nP22B",
+                  "us-east-1_S5zs48BQ8",
                   ":",
-                  "6dkse6kuhg779dhl6glmefrmrq"
+                  "q6pv2fdcs4s7to7ocp8th73n4"
                 ]
               ]
             },
@@ -283,8 +283,8 @@
           }
         },
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         }
       },
       "UpdateReplacePolicy": "Delete",
@@ -296,7 +296,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK0BP0B68iLS4llisuq26Qaa1SIh/y5Fqj3NzJsZDXpXQVWYKZbW9aWnK6QjRkHXirG9MlO8JBvuTBIgnSOOpxC8qm/884upPSHLuvqTg0MWkvdyXucmeNyLGPsYkCUrMgOkGc7DWXPOioND6OLmpTXoLVRFF4nK8clCA0Lz1Q/RUZAezgAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WZHIBxhOXoyBeDa1XXWhbBO6SkzTfzfEoJxm5s1MCWVVQJHpKeTG9rmjK8QjBkHbija90lO4ROPvTOIhngOOJ++dqm/884upHSHLuvqTg0UWkvdyXufGO9yLaPMYkCUp0gPEGc7DWVNKir1F6MLmVe5gW0GRdYEoH58sNCA0X/0AGiQi/s4AAAA="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/auth/CDKMetadata/Default"
@@ -571,20 +571,20 @@
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
-      "Value": "us-east-1_5iU0nP22B"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
+      "Value": "us-east-1_S5zs48BQ8"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref": {
-      "Value": "6dkse6kuhg779dhl6glmefrmrq"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef": {
+      "Value": "q6pv2fdcs4s7to7ocp8th73n4"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-      "Value": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+      "Value": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-      "Value": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+      "Value": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
index a1318b02429..6599fcec5a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
@@ -1,10 +1,10 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
index 814d6aa1750..72989864456 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"AmplifySandbox\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
   "Resources": {
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketEncryption": {
@@ -65,10 +65,10 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy3B9C9171": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy1D08013C": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
-        "Bucket": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+        "Bucket": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
         "PolicyDocument": {
           "Statement": [
             {
@@ -83,12 +83,12 @@
                 "AWS": "*"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -107,12 +107,12 @@
                 "AWS": "arn:aws:iam::123456789012:role/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
               },
               "Resource": [
-                "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                 {
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/*"
                     ]
                   ]
@@ -129,11 +129,11 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Policy/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResourceD9B4EAB6": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResource27E2B2D3": {
       "Type": "Custom::S3AutoDeleteObjects",
       "Properties": {
         "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
-        "BucketName": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "BucketName": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -187,7 +187,7 @@
             "",
             [
               "Lambda function for auto-deleting objects in ",
-              "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+              "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
               " S3 bucket."
             ]
           ]
@@ -201,24 +201,24 @@
         "aws:asset:property": "Code"
       }
     },
-    "MOODBOARD20E29595008142E3AD16F01C4066E1C47DE24GEN2DGPVVCWECQBUCKETNAMEParameterB3838DF7": {
+    "MOODBOARD20E29595008142E3AD16F01C4066E1C4AA2CCGEN2GCKKOKEZWDBUCKETNAMEParameter6DDF0413": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAME",
         "Tags": {
           "amplify:deployment-type": "sandbox",
           "created-by": "amplify"
         },
         "Type": "String",
-        "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+        "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAMEParameter/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -230,7 +230,7 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                    "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                     "/public/*"
                   ]
                 ]
@@ -247,14 +247,14 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+          "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -263,7 +263,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/amplify-moodboard-e2e-sandbox-x--storageAccess3/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -276,7 +276,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -285,7 +285,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -294,7 +294,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -309,7 +309,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -318,7 +318,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -327,7 +327,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -349,7 +349,7 @@
                 }
               },
               "Effect": "Allow",
-              "Resource": "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+              "Resource": "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
             },
             {
               "Action": "s3:DeleteObject",
@@ -359,7 +359,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/public/*"
                     ]
                   ]
@@ -368,7 +368,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/protected/*"
                     ]
                   ]
@@ -377,7 +377,7 @@
                   "Fn::Join": [
                     "",
                     [
-                      "arn:aws:s3:::amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z",
+                      "arn:aws:s3:::amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu",
                       "/private/*"
                     ]
                   ]
@@ -387,9 +387,9 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B",
         "Roles": [
-          "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+          "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
         ]
       },
       "UpdateReplacePolicy": "Delete",
@@ -401,7 +401,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3pxIXbNs5QrccJoSw1ldsmkWJ3G4ry31EXicKRk1/reT9qqJ8qqDb6yqXpxnKiM8RXZMGuFW1Gpa/8EXkLcT+bEUUdPl1Wp1hYupErnovf4cXPW7gjhmzdzeJfcELBt/OARrhI7yqjxk9kvtbW/P+jOwda0YIW3b06KWYLsZVArm900BYFw7Lx8yRF2kJc17NKSR1mFm+PyH4OBhe06j+oCf5CHYa9ZlQ7ZpRWdE+uT8r5DmHgh0tdQ/0I1WZgojLMTsgiHPP9BuZ0Chp6AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3p2IXbNs5QrUeEUJaaym2TSLG7gaL8d9RFonDk5Nd63o8a6l0F1UZfuTTdWE50hviMLNi1os2o9JXfI28hHmYzoqjjh8vqNRaWPskVj8Xv8OLnLdwQQ7buZ/FPOKHgy3lAI1ykN5VR4ycyX2tr/v/RnQOtaEGL7ladFLOF2Eog1zc6aIuCYdn4eZIibSGu61mlpI4zi7cnZD8Hgwta9R/UBH+hDsNBM6o9M0oruifXJ+V8hzDw3aV+gPsdVJuBicowOyGLcMr3Gy0BuPp6AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/CDKMetadata/Default"
@@ -676,16 +676,16 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref": {
-      "Value": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+    "amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef": {
+      "Value": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-x-x-authmoodboard759ae00a-x.template.json b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-x-x-authmoodboard759ae00a-x.template.json
index 77fb5f7f97c..7ea28893dc3 100644
--- a/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-x-x-authmoodboard759ae00a-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.post.refactor/update.amplify-moodboard-x-x-authmoodboard759ae00a-x.template.json
@@ -176,7 +176,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_uFCFZxzU8"
+        "UserPoolId": "us-east-1_s6JCk9b66"
       }
     },
     "UserPoolClient": {
@@ -188,7 +188,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_uFCFZxzU8"
+        "UserPoolId": "us-east-1_s6JCk9b66"
       }
     },
     "UserPoolClientRole": {
@@ -235,7 +235,7 @@
         "AllowUnauthenticatedIdentities": "true",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "4jbh65m4dc0ipi3j8918a7d372",
+            "ClientId": "137ba15dh8fv20rcesjb7ocvhq",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -243,13 +243,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_uFCFZxzU8"
+                  "client": "us-east-1_s6JCk9b66"
                 }
               ]
             }
           },
           {
-            "ClientId": "74tvl72po139f1o6bp04rcs7s",
+            "ClientId": "7d0ivgc5sn4orr5fq46rfep64t",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -257,7 +257,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_uFCFZxzU8"
+                  "client": "us-east-1_s6JCk9b66"
                 }
               ]
             }
@@ -277,7 +277,7 @@
     "IdentityPoolRoleMap": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843",
+        "IdentityPoolId": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12",
         "Roles": {
           "unauthenticated": "arn:aws:iam::123456789012:role/amplify-moodboard-x-x-unauthRole",
           "authenticated": "arn:aws:iam::123456789012:role/amplify-moodboard-x-x-authRole"
@@ -288,29 +288,29 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843"
+      "Value": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12"
     },
     "IdentityPoolName": {
       "Value": "moodboard759ae00a_identitypool_759ae00a__x"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_uFCFZxzU8"
+      "Value": "us-east-1_s6JCk9b66"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_uFCFZxzU8"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_s6JCk9b66"
     },
     "UserPoolName": {
       "Value": "moodboard759ae00a_userpool_759ae00a"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "74tvl72po139f1o6bp04rcs7s"
+      "Value": "7d0ivgc5sn4orr5fq46rfep64t"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "4jbh65m4dc0ipi3j8918a7d372"
+      "Value": "137ba15dh8fv20rcesjb7ocvhq"
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
index f680a4e421c..830f5e98653 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
@@ -8,7 +8,7 @@
       "DeploymentBucketName": "amplify-moodboard-x-x-deployment",
       "UnauthRoleName": "amplify-moodboard-x-x-unauthRole",
       "StackName": "amplify-moodboard-x-x",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/89310e30-3926-11f1-aaf3-0afff4ed678f",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/9f24d640-3e85-11f1-962e-0affccb07fed",
       "AmplifyAppId": "moodboard"
     }
   },
@@ -42,17 +42,17 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/auth/moodboard759ae00a-cloudformation-template.json",
         "logicalId": "authmoodboard759ae00a"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
-        "UserPoolId": "us-east-1_uFCFZxzU8",
-        "AppClientIDWeb": "74tvl72po139f1o6bp04rcs7s",
-        "AppClientID": "4jbh65m4dc0ipi3j8918a7d372",
-        "IdentityPoolId": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_uFCFZxzU8",
+        "UserPoolId": "us-east-1_s6JCk9b66",
+        "AppClientIDWeb": "7d0ivgc5sn4orr5fq46rfep64t",
+        "AppClientID": "137ba15dh8fv20rcesjb7ocvhq",
+        "IdentityPoolId": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_s6JCk9b66",
         "IdentityPoolName": "moodboard759ae00a_identitypool_759ae00a__x",
         "UserPoolName": "moodboard759ae00a_userpool_759ae00a"
       },
-      "lastPushDirHash": "YoAgoR9zujggRkSUxqGO4UbI+Og="
+      "lastPushDirHash": "jB1VavtpdwOOux8BXZGce8+Cy8c="
     }
   },
   "api": {
@@ -87,16 +87,16 @@
             }
           ]
         },
-        "GraphQLAPIIdOutput": "g26hrobfy5b5pniveska5ylg4u",
-        "GraphQLAPIEndpointOutput": "https://e4tubez5fjbb3nezriwdcqaade.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "xn3j437hmbcnfl2xxwcnmqujpy",
+        "GraphQLAPIEndpointOutput": "https://c2wqjlgc55b7rht2i2ism5l2dq.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apimoodboard"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
-      "lastPushDirHash": "0JbVf/uPo6mBgsiJKWwvLc92CLs="
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
+      "lastPushDirHash": "xMmxbmEMUtVd6XarIcyGoAM+qAo="
     }
   },
   "storage": {
@@ -104,7 +104,7 @@
       "service": "S3",
       "providerPlugin": "awscloudformation",
       "dependsOn": [],
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "logicalId": "storagemoodboardStorage"
@@ -113,7 +113,7 @@
         "BucketName": "moodboard20e29595008142e3ad16f01c4066e1c4x-x",
         "Region": "us-east-1"
       },
-      "lastPushDirHash": "z3bRVMUaOPcCXFeBaOqmzI2Vp0M="
+      "lastPushDirHash": "KK0zPv1jr3gKJUH64W5q2xoEaY8="
     }
   },
   "function": {
@@ -121,9 +121,9 @@
       "build": true,
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "lastBuildTimeStamp": "2026-04-15T23:56:15.057Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:12.338Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:15.082Z",
+      "lastPackageTimeStamp": "2026-04-22T20:00:12.377Z",
       "distZipFilename": "moodboardGetRandomEmoji-59616d4f4b546a305a75-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
@@ -133,7 +133,7 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardGetRandomEmoji-cloudformation-template.json",
         "logicalId": "functionmoodboardGetRandomEmoji"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboardLambdaRolef849b419-x",
         "Region": "us-east-1",
@@ -141,7 +141,7 @@
         "Name": "moodboardGetRandomEmoji-x",
         "LambdaExecutionRole": "moodboardLambdaRolef849b419-x"
       },
-      "lastPushDirHash": "K/RndAAIl0V/ON0s1svTQIR0HvE="
+      "lastPushDirHash": "FO6A0hwHk9Nxh1wC+xX3Dvzqu5M="
     },
     "moodboardKinesisReader": {
       "build": true,
@@ -156,9 +156,9 @@
           ]
         }
       ],
-      "lastBuildTimeStamp": "2026-04-15T23:56:15.902Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:13.142Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:15.914Z",
+      "lastPackageTimeStamp": "2026-04-22T20:00:13.151Z",
       "distZipFilename": "moodboardKinesisReader-4934782b72546e51707a-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
@@ -168,7 +168,7 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisReader-cloudformation-template.json",
         "logicalId": "functionmoodboardKinesisReader"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboardLambdaRole1f55eecd-x",
         "Region": "us-east-1",
@@ -176,7 +176,7 @@
         "Name": "moodboardKinesisReader-x",
         "LambdaExecutionRole": "moodboardLambdaRole1f55eecd-x"
       },
-      "lastPushDirHash": "Hm1fZAAyF9uAjfeygeDAxRhFnjI="
+      "lastPushDirHash": "4q0HaxfI1U09/d1sYf+r1tzE7Ug="
     },
     "moodboardKinesisTrigger": {
       "build": true,
@@ -200,19 +200,19 @@
           ]
         }
       ],
-      "lastBuildTimeStamp": "2026-04-15T23:56:16.683Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:13.718Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:16.696Z",
-      "distZipFilename": "moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+      "lastPackageTimeStamp": "2026-04-22T20:00:13.727Z",
+      "distZipFilename": "moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-        "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip"
+        "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip"
       },
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "logicalId": "functionmoodboardKinesisTrigger"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboard2604151154LambdaRoleba2650b3-x",
         "Region": "us-east-1",
@@ -220,7 +220,7 @@
         "Name": "moodboardKinesisTrigger-x",
         "LambdaExecutionRole": "moodboard2604151154LambdaRoleba2650b3-x"
       },
-      "lastPushDirHash": "JcRwdYiRhPhYpnY0zH0oZvhkTaA="
+      "lastPushDirHash": "Mi/EPGJJNuwLpTM5ihBUy4AlbO0="
     }
   },
   "analytics": {
@@ -231,13 +231,13 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/analytics/kinesis-cloudformation-template.json",
         "logicalId": "analyticsmoodboardKinesis"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.749Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.583Z",
       "output": {
         "kinesisStreamId": "moodboardKinesis-x",
         "kinesisStreamShardCount": "1",
         "kinesisStreamArn": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-x"
       },
-      "lastPushDirHash": "IxnZjkEVCO8rMzaALT+khby+HWU="
+      "lastPushDirHash": "D9scGAJ928ms/58MssM57rDqZBI="
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/cloudformation-template.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/cloudformation-template.json
index 71f1788528b..e04e7f8159a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/cloudformation-template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/cloudformation-template.json
@@ -128,7 +128,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807833377
+        "Expires": 1808424014
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -260,6 +260,12 @@
               "Outputs.transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId"
             ]
           },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
           "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
             "Fn::GetAtt": [
               "MoodItem",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/parameters.json
index e4bd3ccf07c..275158ee314 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/parameters.json
@@ -9,5 +9,5 @@
         ]
     },
     "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-    "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl
new file mode 100644
index 00000000000..d767371eafa
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl
@@ -0,0 +1,18 @@
+## [Start] Custom finish slot - Append "(new!)" tag to board name in response. **
+## This runs as the final step before the response is returned to the client.
+## It adds a visual indicator that the board was just created.
+
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+#if( !$util.isNullOrEmpty($ctx.prev.result) )
+  #set( $result = $ctx.prev.result )
+  #if( !$util.isNullOrEmpty($result.name) )
+    $util.qr($result.put("name", "${result.name} (new!)"))
+  #end
+  $util.toJson($result)
+#else
+  $util.toJson($ctx.prev.result)
+#end
+## [End] Custom finish slot - Append "(new!)" tag to board name in response. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl
new file mode 100644
index 00000000000..3a6b5233573
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl
@@ -0,0 +1,26 @@
+## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **
+## This runs after init.1 (which sets id, createdAt, updatedAt).
+## We read the hour from createdAt and prepend a matching emoji to the board name.
+
+#set( $createdAt = $ctx.stash.defaultValues.createdAt )
+#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )
+## Convert epoch millis to approximate hour (UTC)
+#set( $hourOfDay = $hour / 3600000 % 24 )
+
+#if( $hourOfDay >= 5 && $hourOfDay < 12 )
+  #set( $emoji = "🌅" )
+#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )
+  #set( $emoji = "☀️" )
+#else
+  #set( $emoji = "🌙" )
+#end
+
+## Prepend the emoji to the board name
+#set( $inputName = $util.defaultIfNull($ctx.args.input.name, "") )
+$util.qr($ctx.stash.defaultValues.put("name", "${emoji} ${inputName}"))
+
+$util.toJson({
+  "version": "2018-05-29",
+  "payload": {}
+})
+## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
index ef976126825..de4c96624a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
@@ -1,6 +1,10 @@
-## [Start] List Request. **
+## [Start] Custom List Request - Override to cap results at 50. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
-#set( $limit = $util.defaultIfNull($args.limit, 100) )
+#set( $limit = $util.defaultIfNull($args.limit, 50) )
+## Cap the limit at 50 to keep the board list manageable
+#if( $limit > 50 )
+  #set( $limit = 50 )
+#end
 #set( $ListRequest = {
   "version": "2018-05-29",
   "limit": $limit
@@ -47,4 +51,4 @@
   #set( $ListRequest.IndexName = $ctx.stash.metadata.index )
 #end
 $util.toJson($ListRequest)
-## [End] List Request. **
+## [End] Custom List Request. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
index aab9983954e..7d06b986744 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
@@ -1,7 +1,14 @@
-## [Start] ResponseTemplate. **
+## [Start] Custom ResponseTemplate - Prepend emoji to board names to prove override is active. **
 #if( $ctx.error )
   $util.error($ctx.error.message, $ctx.error.type)
-#else
-  $util.toJson($ctx.result)
 #end
-## [End] ResponseTemplate. **
+
+## Add a pin emoji prefix to each board name so it's visible on the frontend
+#foreach( $item in $ctx.result.items )
+  #if( !$item.name.startsWith("📌 ") )
+    $util.qr($item.put("name", "📌 $item.name"))
+  #end
+#end
+
+$util.toJson($ctx.result)
+## [End] Custom ResponseTemplate. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/Board.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/Board.json
index a00e6579cb1..b93cc25b95c 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/Board.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/Board.json
@@ -55,6 +55,9 @@
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId": {
       "Type": "String"
     },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    },
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
       "Type": "String"
     },
@@ -455,7 +458,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +553,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -558,6 +561,66 @@
         "TypeName": "Query"
       }
     },
+    "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardinit1Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.init.2.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardfinish0Function",
+        "RequestMappingTemplate": "$util.toJson({})",
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.finish.1.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
     "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
@@ -622,6 +685,12 @@
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId"
             },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A",
+                "FunctionId"
+              ]
+            },
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId"
             },
@@ -633,6 +702,12 @@
                 "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5",
                 "FunctionId"
               ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3",
+                "FunctionId"
+              ]
             }
           ]
         },
@@ -648,7 +723,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +875,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +1024,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +1061,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1098,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1135,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/ConnectionStack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/ConnectionStack.json
index e7de9446f4d..e8a18be281f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMoodItemTable5135EED9Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackBoardNestedStackBoardNestedStackResource9E449E87OutputstransformerrootstackBoardBoardTable30788E07Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/KinesisEventCount.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/KinesisEventCount.json
index 500fdbf18d6..684a60afb8f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/KinesisEventCount.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/KinesisEventCount.json
@@ -455,7 +455,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +550,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -648,7 +648,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +800,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +949,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +986,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1023,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1060,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/MoodItem.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/MoodItem.json
index a04af5fc6ed..1ed8e375800 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/MoodItem.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/build/stacks/MoodItem.json
@@ -548,7 +548,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -649,7 +649,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -816,7 +816,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1004,7 +1004,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1156,7 +1156,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1277,7 +1277,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1323,7 +1323,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1369,7 +1369,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1470,7 +1470,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl
new file mode 100644
index 00000000000..d767371eafa
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl
@@ -0,0 +1,18 @@
+## [Start] Custom finish slot - Append "(new!)" tag to board name in response. **
+## This runs as the final step before the response is returned to the client.
+## It adds a visual indicator that the board was just created.
+
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+#if( !$util.isNullOrEmpty($ctx.prev.result) )
+  #set( $result = $ctx.prev.result )
+  #if( !$util.isNullOrEmpty($result.name) )
+    $util.qr($result.put("name", "${result.name} (new!)"))
+  #end
+  $util.toJson($result)
+#else
+  $util.toJson($ctx.prev.result)
+#end
+## [End] Custom finish slot - Append "(new!)" tag to board name in response. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl
new file mode 100644
index 00000000000..3a6b5233573
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl
@@ -0,0 +1,26 @@
+## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **
+## This runs after init.1 (which sets id, createdAt, updatedAt).
+## We read the hour from createdAt and prepend a matching emoji to the board name.
+
+#set( $createdAt = $ctx.stash.defaultValues.createdAt )
+#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )
+## Convert epoch millis to approximate hour (UTC)
+#set( $hourOfDay = $hour / 3600000 % 24 )
+
+#if( $hourOfDay >= 5 && $hourOfDay < 12 )
+  #set( $emoji = "🌅" )
+#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )
+  #set( $emoji = "☀️" )
+#else
+  #set( $emoji = "🌙" )
+#end
+
+## Prepend the emoji to the board name
+#set( $inputName = $util.defaultIfNull($ctx.args.input.name, "") )
+$util.qr($ctx.stash.defaultValues.put("name", "${emoji} ${inputName}"))
+
+$util.toJson({
+  "version": "2018-05-29",
+  "payload": {}
+})
+## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.req.vtl
new file mode 100644
index 00000000000..de4c96624a5
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.req.vtl
@@ -0,0 +1,54 @@
+## [Start] Custom List Request - Override to cap results at 50. **
+#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
+#set( $limit = $util.defaultIfNull($args.limit, 50) )
+## Cap the limit at 50 to keep the board list manageable
+#if( $limit > 50 )
+  #set( $limit = 50 )
+#end
+#set( $ListRequest = {
+  "version": "2018-05-29",
+  "limit": $limit
+} )
+#if( $args.nextToken )
+  #set( $ListRequest.nextToken = $args.nextToken )
+#end
+#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
+  #set( $filter = $ctx.stash.authFilter )
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = {
+  "and":   [$filter, $args.filter]
+} )
+  #end
+#else
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = $args.filter )
+  #end
+#end
+#if( !$util.isNullOrEmpty($filter) )
+  #set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
+  #if( $util.isNullOrEmpty($filterExpression) )
+    $util.error("Unable to process the filter expression", "Unrecognized Filter")
+  #end
+  #if( !$util.isNullOrBlank($filterExpression.expression) )
+    #if( $filterExpression.expressionValues.size() == 0 )
+      $util.qr($filterExpression.remove("expressionValues"))
+    #end
+    #set( $ListRequest.filter = $filterExpression )
+  #end
+#end
+#if( !$util.isNull($ctx.stash.modelQueryExpression) && !$util.isNullOrEmpty($ctx.stash.modelQueryExpression.expression) )
+  $util.qr($ListRequest.put("operation", "Query"))
+  $util.qr($ListRequest.put("query", $ctx.stash.modelQueryExpression))
+  #if( !$util.isNull($args.sortDirection) && $args.sortDirection == "DESC" )
+    #set( $ListRequest.scanIndexForward = false )
+  #else
+    #set( $ListRequest.scanIndexForward = true )
+  #end
+#else
+  $util.qr($ListRequest.put("operation", "Scan"))
+#end
+#if( !$util.isNull($ctx.stash.metadata.index) )
+  #set( $ListRequest.IndexName = $ctx.stash.metadata.index )
+#end
+$util.toJson($ListRequest)
+## [End] Custom List Request. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.res.vtl
new file mode 100644
index 00000000000..7d06b986744
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/api/moodboard/resolvers/Query.listBoards.res.vtl
@@ -0,0 +1,14 @@
+## [Start] Custom ResponseTemplate - Prepend emoji to board names to prove override is active. **
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+## Add a pin emoji prefix to each board name so it's visible on the frontend
+#foreach( $item in $ctx.result.items )
+  #if( !$item.name.startsWith("📌 ") )
+    $util.qr($item.put("name", "📌 $item.name"))
+  #end
+#end
+
+$util.toJson($ctx.result)
+## [End] Custom ResponseTemplate. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
index 71f1788528b..e04e7f8159a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
@@ -128,7 +128,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807833377
+        "Expires": 1808424014
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -260,6 +260,12 @@
               "Outputs.transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId"
             ]
           },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
           "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
             "Fn::GetAtt": [
               "MoodItem",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 182fae93e41..d5cfca0a2ca 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -268,7 +268,7 @@
             ]
           },
           "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441",
+          "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812",
           "env": "x"
         }
       }
@@ -340,7 +340,7 @@
         "TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "Parameters": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
           "analyticsmoodboardKinesiskinesisStreamArn": {
             "Fn::GetAtt": [
               "analyticsmoodboardKinesis",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 182fae93e41..d5cfca0a2ca 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -268,7 +268,7 @@
             ]
           },
           "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441",
+          "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812",
           "env": "x"
         }
       }
@@ -340,7 +340,7 @@
         "TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "Parameters": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
           "analyticsmoodboardKinesiskinesisStreamArn": {
             "Fn::GetAtt": [
               "analyticsmoodboardKinesis",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
index 74360963202..f9862ac4a05 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
@@ -69,7 +69,12 @@
     }
   },
   "function": {
-    "moodboardKinesisTrigger": {
+    "moodboardGetRandomEmoji": {
+      "build": true,
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    },
+    "moodboardKinesisReader": {
       "build": true,
       "dependsOn": [
         {
@@ -78,26 +83,12 @@
           ],
           "category": "analytics",
           "resourceName": "moodboardKinesis"
-        },
-        {
-          "attributes": [
-            "GraphQLAPIIdOutput",
-            "GraphQLAPIEndpointOutput",
-            "GraphQLAPIKeyOutput"
-          ],
-          "category": "api",
-          "resourceName": "moodboard"
         }
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda"
     },
-    "moodboardGetRandomEmoji": {
-      "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda"
-    },
-    "moodboardKinesisReader": {
+    "moodboardKinesisTrigger": {
       "build": true,
       "dependsOn": [
         {
@@ -106,6 +97,15 @@
           ],
           "category": "analytics",
           "resourceName": "moodboardKinesis"
+        },
+        {
+          "attributes": [
+            "GraphQLAPIIdOutput",
+            "GraphQLAPIEndpointOutput",
+            "GraphQLAPIKeyOutput"
+          ],
+          "category": "api",
+          "resourceName": "moodboard"
         }
       ],
       "providerPlugin": "awscloudformation",
@@ -113,51 +113,51 @@
     }
   },
   "parameters": {
-    "AMPLIFY_function_moodboardKinesisTrigger_deploymentBucketName": {
+    "AMPLIFY_function_moodboardGetRandomEmoji_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisTrigger"
+          "resourceName": "moodboardGetRandomEmoji"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisTrigger_s3Key": {
+    "AMPLIFY_function_moodboardGetRandomEmoji_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisTrigger"
+          "resourceName": "moodboardGetRandomEmoji"
         }
       ]
     },
-    "AMPLIFY_function_moodboardGetRandomEmoji_deploymentBucketName": {
+    "AMPLIFY_function_moodboardKinesisReader_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardGetRandomEmoji"
+          "resourceName": "moodboardKinesisReader"
         }
       ]
     },
-    "AMPLIFY_function_moodboardGetRandomEmoji_s3Key": {
+    "AMPLIFY_function_moodboardKinesisReader_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardGetRandomEmoji"
+          "resourceName": "moodboardKinesisReader"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisReader_deploymentBucketName": {
+    "AMPLIFY_function_moodboardKinesisTrigger_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisReader"
+          "resourceName": "moodboardKinesisTrigger"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisReader_s3Key": {
+    "AMPLIFY_function_moodboardKinesisTrigger_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisReader"
+          "resourceName": "moodboardKinesisTrigger"
         }
       ]
     }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/amplify-meta.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/amplify-meta.json
index f680a4e421c..830f5e98653 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/amplify-meta.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/amplify-meta.json
@@ -8,7 +8,7 @@
       "DeploymentBucketName": "amplify-moodboard-x-x-deployment",
       "UnauthRoleName": "amplify-moodboard-x-x-unauthRole",
       "StackName": "amplify-moodboard-x-x",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/89310e30-3926-11f1-aaf3-0afff4ed678f",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/9f24d640-3e85-11f1-962e-0affccb07fed",
       "AmplifyAppId": "moodboard"
     }
   },
@@ -42,17 +42,17 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/auth/moodboard759ae00a-cloudformation-template.json",
         "logicalId": "authmoodboard759ae00a"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
-        "UserPoolId": "us-east-1_uFCFZxzU8",
-        "AppClientIDWeb": "74tvl72po139f1o6bp04rcs7s",
-        "AppClientID": "4jbh65m4dc0ipi3j8918a7d372",
-        "IdentityPoolId": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_uFCFZxzU8",
+        "UserPoolId": "us-east-1_s6JCk9b66",
+        "AppClientIDWeb": "7d0ivgc5sn4orr5fq46rfep64t",
+        "AppClientID": "137ba15dh8fv20rcesjb7ocvhq",
+        "IdentityPoolId": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_s6JCk9b66",
         "IdentityPoolName": "moodboard759ae00a_identitypool_759ae00a__x",
         "UserPoolName": "moodboard759ae00a_userpool_759ae00a"
       },
-      "lastPushDirHash": "YoAgoR9zujggRkSUxqGO4UbI+Og="
+      "lastPushDirHash": "jB1VavtpdwOOux8BXZGce8+Cy8c="
     }
   },
   "api": {
@@ -87,16 +87,16 @@
             }
           ]
         },
-        "GraphQLAPIIdOutput": "g26hrobfy5b5pniveska5ylg4u",
-        "GraphQLAPIEndpointOutput": "https://e4tubez5fjbb3nezriwdcqaade.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "xn3j437hmbcnfl2xxwcnmqujpy",
+        "GraphQLAPIEndpointOutput": "https://c2wqjlgc55b7rht2i2ism5l2dq.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apimoodboard"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
-      "lastPushDirHash": "0JbVf/uPo6mBgsiJKWwvLc92CLs="
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
+      "lastPushDirHash": "xMmxbmEMUtVd6XarIcyGoAM+qAo="
     }
   },
   "storage": {
@@ -104,7 +104,7 @@
       "service": "S3",
       "providerPlugin": "awscloudformation",
       "dependsOn": [],
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "logicalId": "storagemoodboardStorage"
@@ -113,7 +113,7 @@
         "BucketName": "moodboard20e29595008142e3ad16f01c4066e1c4x-x",
         "Region": "us-east-1"
       },
-      "lastPushDirHash": "z3bRVMUaOPcCXFeBaOqmzI2Vp0M="
+      "lastPushDirHash": "KK0zPv1jr3gKJUH64W5q2xoEaY8="
     }
   },
   "function": {
@@ -121,9 +121,9 @@
       "build": true,
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "lastBuildTimeStamp": "2026-04-15T23:56:15.057Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:12.338Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:15.082Z",
+      "lastPackageTimeStamp": "2026-04-22T20:00:12.377Z",
       "distZipFilename": "moodboardGetRandomEmoji-59616d4f4b546a305a75-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
@@ -133,7 +133,7 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardGetRandomEmoji-cloudformation-template.json",
         "logicalId": "functionmoodboardGetRandomEmoji"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboardLambdaRolef849b419-x",
         "Region": "us-east-1",
@@ -141,7 +141,7 @@
         "Name": "moodboardGetRandomEmoji-x",
         "LambdaExecutionRole": "moodboardLambdaRolef849b419-x"
       },
-      "lastPushDirHash": "K/RndAAIl0V/ON0s1svTQIR0HvE="
+      "lastPushDirHash": "FO6A0hwHk9Nxh1wC+xX3Dvzqu5M="
     },
     "moodboardKinesisReader": {
       "build": true,
@@ -156,9 +156,9 @@
           ]
         }
       ],
-      "lastBuildTimeStamp": "2026-04-15T23:56:15.902Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:13.142Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:15.914Z",
+      "lastPackageTimeStamp": "2026-04-22T20:00:13.151Z",
       "distZipFilename": "moodboardKinesisReader-4934782b72546e51707a-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
@@ -168,7 +168,7 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisReader-cloudformation-template.json",
         "logicalId": "functionmoodboardKinesisReader"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboardLambdaRole1f55eecd-x",
         "Region": "us-east-1",
@@ -176,7 +176,7 @@
         "Name": "moodboardKinesisReader-x",
         "LambdaExecutionRole": "moodboardLambdaRole1f55eecd-x"
       },
-      "lastPushDirHash": "Hm1fZAAyF9uAjfeygeDAxRhFnjI="
+      "lastPushDirHash": "4q0HaxfI1U09/d1sYf+r1tzE7Ug="
     },
     "moodboardKinesisTrigger": {
       "build": true,
@@ -200,19 +200,19 @@
           ]
         }
       ],
-      "lastBuildTimeStamp": "2026-04-15T23:56:16.683Z",
+      "lastBuildTimeStamp": "2026-04-22T20:00:13.718Z",
       "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-04-15T23:56:16.696Z",
-      "distZipFilename": "moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+      "lastPackageTimeStamp": "2026-04-22T20:00:13.727Z",
+      "distZipFilename": "moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
       "s3Bucket": {
         "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-        "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip"
+        "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip"
       },
       "providerMetadata": {
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "logicalId": "functionmoodboardKinesisTrigger"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.057Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.111Z",
       "output": {
         "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/moodboard2604151154LambdaRoleba2650b3-x",
         "Region": "us-east-1",
@@ -220,7 +220,7 @@
         "Name": "moodboardKinesisTrigger-x",
         "LambdaExecutionRole": "moodboard2604151154LambdaRoleba2650b3-x"
       },
-      "lastPushDirHash": "JcRwdYiRhPhYpnY0zH0oZvhkTaA="
+      "lastPushDirHash": "Mi/EPGJJNuwLpTM5ihBUy4AlbO0="
     }
   },
   "analytics": {
@@ -231,13 +231,13 @@
         "s3TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/analytics/kinesis-cloudformation-template.json",
         "logicalId": "analyticsmoodboardKinesis"
       },
-      "lastPushTimeStamp": "2026-04-16T00:02:36.749Z",
+      "lastPushTimeStamp": "2026-04-22T20:06:27.583Z",
       "output": {
         "kinesisStreamId": "moodboardKinesis-x",
         "kinesisStreamShardCount": "1",
         "kinesisStreamArn": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-x"
       },
-      "lastPushDirHash": "IxnZjkEVCO8rMzaALT+khby+HWU="
+      "lastPushDirHash": "D9scGAJ928ms/58MssM57rDqZBI="
     }
   }
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/cloudformation-template.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/cloudformation-template.json
index 71f1788528b..e04e7f8159a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/cloudformation-template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/cloudformation-template.json
@@ -128,7 +128,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807833377
+        "Expires": 1808424014
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -260,6 +260,12 @@
               "Outputs.transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId"
             ]
           },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
           "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
             "Fn::GetAtt": [
               "MoodItem",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/parameters.json
index e4bd3ccf07c..275158ee314 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/parameters.json
@@ -9,5 +9,5 @@
         ]
     },
     "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-    "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
 }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl
new file mode 100644
index 00000000000..d767371eafa
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.finish.1.res.vtl
@@ -0,0 +1,18 @@
+## [Start] Custom finish slot - Append "(new!)" tag to board name in response. **
+## This runs as the final step before the response is returned to the client.
+## It adds a visual indicator that the board was just created.
+
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+#if( !$util.isNullOrEmpty($ctx.prev.result) )
+  #set( $result = $ctx.prev.result )
+  #if( !$util.isNullOrEmpty($result.name) )
+    $util.qr($result.put("name", "${result.name} (new!)"))
+  #end
+  $util.toJson($result)
+#else
+  $util.toJson($ctx.prev.result)
+#end
+## [End] Custom finish slot - Append "(new!)" tag to board name in response. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl
new file mode 100644
index 00000000000..3a6b5233573
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Mutation.createBoard.init.2.req.vtl
@@ -0,0 +1,26 @@
+## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **
+## This runs after init.1 (which sets id, createdAt, updatedAt).
+## We read the hour from createdAt and prepend a matching emoji to the board name.
+
+#set( $createdAt = $ctx.stash.defaultValues.createdAt )
+#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )
+## Convert epoch millis to approximate hour (UTC)
+#set( $hourOfDay = $hour / 3600000 % 24 )
+
+#if( $hourOfDay >= 5 && $hourOfDay < 12 )
+  #set( $emoji = "🌅" )
+#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )
+  #set( $emoji = "☀️" )
+#else
+  #set( $emoji = "🌙" )
+#end
+
+## Prepend the emoji to the board name
+#set( $inputName = $util.defaultIfNull($ctx.args.input.name, "") )
+$util.qr($ctx.stash.defaultValues.put("name", "${emoji} ${inputName}"))
+
+$util.toJson({
+  "version": "2018-05-29",
+  "payload": {}
+})
+## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
index ef976126825..de4c96624a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.req.vtl
@@ -1,6 +1,10 @@
-## [Start] List Request. **
+## [Start] Custom List Request - Override to cap results at 50. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
-#set( $limit = $util.defaultIfNull($args.limit, 100) )
+#set( $limit = $util.defaultIfNull($args.limit, 50) )
+## Cap the limit at 50 to keep the board list manageable
+#if( $limit > 50 )
+  #set( $limit = 50 )
+#end
 #set( $ListRequest = {
   "version": "2018-05-29",
   "limit": $limit
@@ -47,4 +51,4 @@
   #set( $ListRequest.IndexName = $ctx.stash.metadata.index )
 #end
 $util.toJson($ListRequest)
-## [End] List Request. **
+## [End] Custom List Request. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
index aab9983954e..7d06b986744 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/resolvers/Query.listBoards.res.vtl
@@ -1,7 +1,14 @@
-## [Start] ResponseTemplate. **
+## [Start] Custom ResponseTemplate - Prepend emoji to board names to prove override is active. **
 #if( $ctx.error )
   $util.error($ctx.error.message, $ctx.error.type)
-#else
-  $util.toJson($ctx.result)
 #end
-## [End] ResponseTemplate. **
+
+## Add a pin emoji prefix to each board name so it's visible on the frontend
+#foreach( $item in $ctx.result.items )
+  #if( !$item.name.startsWith("📌 ") )
+    $util.qr($item.put("name", "📌 $item.name"))
+  #end
+#end
+
+$util.toJson($ctx.result)
+## [End] Custom ResponseTemplate. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/Board.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/Board.json
index a00e6579cb1..b93cc25b95c 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/Board.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/Board.json
@@ -55,6 +55,9 @@
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId": {
       "Type": "String"
     },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    },
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
       "Type": "String"
     },
@@ -455,7 +458,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +553,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -558,6 +561,66 @@
         "TypeName": "Query"
       }
     },
+    "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardinit1Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.init.2.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardfinish0Function",
+        "RequestMappingTemplate": "$util.toJson({})",
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.finish.1.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
     "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
@@ -622,6 +685,12 @@
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId"
             },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A",
+                "FunctionId"
+              ]
+            },
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId"
             },
@@ -633,6 +702,12 @@
                 "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5",
                 "FunctionId"
               ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3",
+                "FunctionId"
+              ]
             }
           ]
         },
@@ -648,7 +723,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +875,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +1024,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +1061,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1098,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1135,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/ConnectionStack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/ConnectionStack.json
index e7de9446f4d..e8a18be281f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMoodItemTable5135EED9Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackBoardNestedStackBoardNestedStackResource9E449E87OutputstransformerrootstackBoardBoardTable30788E07Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/KinesisEventCount.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/KinesisEventCount.json
index 500fdbf18d6..684a60afb8f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/KinesisEventCount.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/KinesisEventCount.json
@@ -455,7 +455,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +550,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -648,7 +648,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +800,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +949,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +986,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1023,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1060,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/MoodItem.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/MoodItem.json
index a04af5fc6ed..1ed8e375800 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/MoodItem.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/build/stacks/MoodItem.json
@@ -548,7 +548,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -649,7 +649,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -816,7 +816,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1004,7 +1004,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1156,7 +1156,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1277,7 +1277,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1323,7 +1323,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1369,7 +1369,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1470,7 +1470,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl
new file mode 100644
index 00000000000..d767371eafa
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.finish.1.res.vtl
@@ -0,0 +1,18 @@
+## [Start] Custom finish slot - Append "(new!)" tag to board name in response. **
+## This runs as the final step before the response is returned to the client.
+## It adds a visual indicator that the board was just created.
+
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+#if( !$util.isNullOrEmpty($ctx.prev.result) )
+  #set( $result = $ctx.prev.result )
+  #if( !$util.isNullOrEmpty($result.name) )
+    $util.qr($result.put("name", "${result.name} (new!)"))
+  #end
+  $util.toJson($result)
+#else
+  $util.toJson($ctx.prev.result)
+#end
+## [End] Custom finish slot - Append "(new!)" tag to board name in response. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl
new file mode 100644
index 00000000000..3a6b5233573
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Mutation.createBoard.init.2.req.vtl
@@ -0,0 +1,26 @@
+## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **
+## This runs after init.1 (which sets id, createdAt, updatedAt).
+## We read the hour from createdAt and prepend a matching emoji to the board name.
+
+#set( $createdAt = $ctx.stash.defaultValues.createdAt )
+#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )
+## Convert epoch millis to approximate hour (UTC)
+#set( $hourOfDay = $hour / 3600000 % 24 )
+
+#if( $hourOfDay >= 5 && $hourOfDay < 12 )
+  #set( $emoji = "🌅" )
+#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )
+  #set( $emoji = "☀️" )
+#else
+  #set( $emoji = "🌙" )
+#end
+
+## Prepend the emoji to the board name
+#set( $inputName = $util.defaultIfNull($ctx.args.input.name, "") )
+$util.qr($ctx.stash.defaultValues.put("name", "${emoji} ${inputName}"))
+
+$util.toJson({
+  "version": "2018-05-29",
+  "payload": {}
+})
+## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.req.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.req.vtl
new file mode 100644
index 00000000000..de4c96624a5
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.req.vtl
@@ -0,0 +1,54 @@
+## [Start] Custom List Request - Override to cap results at 50. **
+#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
+#set( $limit = $util.defaultIfNull($args.limit, 50) )
+## Cap the limit at 50 to keep the board list manageable
+#if( $limit > 50 )
+  #set( $limit = 50 )
+#end
+#set( $ListRequest = {
+  "version": "2018-05-29",
+  "limit": $limit
+} )
+#if( $args.nextToken )
+  #set( $ListRequest.nextToken = $args.nextToken )
+#end
+#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
+  #set( $filter = $ctx.stash.authFilter )
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = {
+  "and":   [$filter, $args.filter]
+} )
+  #end
+#else
+  #if( !$util.isNullOrEmpty($args.filter) )
+    #set( $filter = $args.filter )
+  #end
+#end
+#if( !$util.isNullOrEmpty($filter) )
+  #set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
+  #if( $util.isNullOrEmpty($filterExpression) )
+    $util.error("Unable to process the filter expression", "Unrecognized Filter")
+  #end
+  #if( !$util.isNullOrBlank($filterExpression.expression) )
+    #if( $filterExpression.expressionValues.size() == 0 )
+      $util.qr($filterExpression.remove("expressionValues"))
+    #end
+    #set( $ListRequest.filter = $filterExpression )
+  #end
+#end
+#if( !$util.isNull($ctx.stash.modelQueryExpression) && !$util.isNullOrEmpty($ctx.stash.modelQueryExpression.expression) )
+  $util.qr($ListRequest.put("operation", "Query"))
+  $util.qr($ListRequest.put("query", $ctx.stash.modelQueryExpression))
+  #if( !$util.isNull($args.sortDirection) && $args.sortDirection == "DESC" )
+    #set( $ListRequest.scanIndexForward = false )
+  #else
+    #set( $ListRequest.scanIndexForward = true )
+  #end
+#else
+  $util.qr($ListRequest.put("operation", "Scan"))
+#end
+#if( !$util.isNull($ctx.stash.metadata.index) )
+  #set( $ListRequest.IndexName = $ctx.stash.metadata.index )
+#end
+$util.toJson($ListRequest)
+## [End] Custom List Request. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.res.vtl b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.res.vtl
new file mode 100644
index 00000000000..7d06b986744
--- /dev/null
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.res.vtl
@@ -0,0 +1,14 @@
+## [Start] Custom ResponseTemplate - Prepend emoji to board names to prove override is active. **
+#if( $ctx.error )
+  $util.error($ctx.error.message, $ctx.error.type)
+#end
+
+## Add a pin emoji prefix to each board name so it's visible on the frontend
+#foreach( $item in $ctx.result.items )
+  #if( !$item.name.startsWith("📌 ") )
+    $util.qr($item.put("name", "📌 $item.name"))
+  #end
+#end
+
+$util.toJson($ctx.result)
+## [End] Custom ResponseTemplate. **
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
index 71f1788528b..e04e7f8159a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/moodboard/build/cloudformation-template.json
@@ -128,7 +128,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807833377
+        "Expires": 1808424014
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -260,6 +260,12 @@
               "Outputs.transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId"
             ]
           },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
           "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
             "Fn::GetAtt": [
               "MoodItem",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 182fae93e41..d5cfca0a2ca 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -268,7 +268,7 @@
             ]
           },
           "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441",
+          "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812",
           "env": "x"
         }
       }
@@ -340,7 +340,7 @@
         "TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "Parameters": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
           "analyticsmoodboardKinesiskinesisStreamArn": {
             "Fn::GetAtt": [
               "analyticsmoodboardKinesis",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 182fae93e41..d5cfca0a2ca 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -268,7 +268,7 @@
             ]
           },
           "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441",
+          "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812",
           "env": "x"
         }
       }
@@ -340,7 +340,7 @@
         "TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "Parameters": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
           "analyticsmoodboardKinesiskinesisStreamArn": {
             "Fn::GetAtt": [
               "analyticsmoodboardKinesis",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/backend-config.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/backend-config.json
index 74360963202..f9862ac4a05 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/backend-config.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/backend-config.json
@@ -69,7 +69,12 @@
     }
   },
   "function": {
-    "moodboardKinesisTrigger": {
+    "moodboardGetRandomEmoji": {
+      "build": true,
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    },
+    "moodboardKinesisReader": {
       "build": true,
       "dependsOn": [
         {
@@ -78,26 +83,12 @@
           ],
           "category": "analytics",
           "resourceName": "moodboardKinesis"
-        },
-        {
-          "attributes": [
-            "GraphQLAPIIdOutput",
-            "GraphQLAPIEndpointOutput",
-            "GraphQLAPIKeyOutput"
-          ],
-          "category": "api",
-          "resourceName": "moodboard"
         }
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda"
     },
-    "moodboardGetRandomEmoji": {
-      "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda"
-    },
-    "moodboardKinesisReader": {
+    "moodboardKinesisTrigger": {
       "build": true,
       "dependsOn": [
         {
@@ -106,6 +97,15 @@
           ],
           "category": "analytics",
           "resourceName": "moodboardKinesis"
+        },
+        {
+          "attributes": [
+            "GraphQLAPIIdOutput",
+            "GraphQLAPIEndpointOutput",
+            "GraphQLAPIKeyOutput"
+          ],
+          "category": "api",
+          "resourceName": "moodboard"
         }
       ],
       "providerPlugin": "awscloudformation",
@@ -113,51 +113,51 @@
     }
   },
   "parameters": {
-    "AMPLIFY_function_moodboardKinesisTrigger_deploymentBucketName": {
+    "AMPLIFY_function_moodboardGetRandomEmoji_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisTrigger"
+          "resourceName": "moodboardGetRandomEmoji"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisTrigger_s3Key": {
+    "AMPLIFY_function_moodboardGetRandomEmoji_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisTrigger"
+          "resourceName": "moodboardGetRandomEmoji"
         }
       ]
     },
-    "AMPLIFY_function_moodboardGetRandomEmoji_deploymentBucketName": {
+    "AMPLIFY_function_moodboardKinesisReader_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardGetRandomEmoji"
+          "resourceName": "moodboardKinesisReader"
         }
       ]
     },
-    "AMPLIFY_function_moodboardGetRandomEmoji_s3Key": {
+    "AMPLIFY_function_moodboardKinesisReader_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardGetRandomEmoji"
+          "resourceName": "moodboardKinesisReader"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisReader_deploymentBucketName": {
+    "AMPLIFY_function_moodboardKinesisTrigger_deploymentBucketName": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisReader"
+          "resourceName": "moodboardKinesisTrigger"
         }
       ]
     },
-    "AMPLIFY_function_moodboardKinesisReader_s3Key": {
+    "AMPLIFY_function_moodboardKinesisTrigger_s3Key": {
       "usedBy": [
         {
           "category": "function",
-          "resourceName": "moodboardKinesisReader"
+          "resourceName": "moodboardKinesisTrigger"
         }
       ]
     }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
index 447bea18be2..4ad9096cc5b 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
@@ -25,21 +25,21 @@ export type AmplifyDependentResourcesAttributes = {
     }
   },
   "function": {
-    "moodboardKinesisTrigger": {
+    "moodboardGetRandomEmoji": {
       "Arn": "string",
       "LambdaExecutionRole": "string",
       "LambdaExecutionRoleArn": "string",
       "Name": "string",
       "Region": "string"
     },
-    "moodboardGetRandomEmoji": {
+    "moodboardKinesisReader": {
       "Arn": "string",
       "LambdaExecutionRole": "string",
       "LambdaExecutionRoleArn": "string",
       "Name": "string",
       "Region": "string"
     },
-    "moodboardKinesisReader": {
+    "moodboardKinesisTrigger": {
       "Arn": "string",
       "LambdaExecutionRole": "string",
       "LambdaExecutionRoleArn": "string",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/team-provider-info.json b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/team-provider-info.json
index 93ea50d1b3e..c044c823d9c 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/team-provider-info.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/team-provider-info.json
@@ -8,7 +8,7 @@
       "DeploymentBucketName": "amplify-moodboard-x-x-deployment",
       "UnauthRoleName": "amplify-moodboard-x-x-unauthRole",
       "StackName": "amplify-moodboard-x-x",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/89310e30-3926-11f1-aaf3-0afff4ed678f",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/9f24d640-3e85-11f1-962e-0affccb07fed",
       "AmplifyAppId": "moodboard"
     },
     "categories": {
@@ -16,10 +16,6 @@
         "moodboard759ae00a": {}
       },
       "function": {
-        "moodboardKinesisTrigger": {
-          "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip"
-        },
         "moodboardGetRandomEmoji": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
           "s3Key": "amplify-builds/moodboardGetRandomEmoji-59616d4f4b546a305a75-build.zip"
@@ -27,6 +23,10 @@
         "moodboardKinesisReader": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
           "s3Key": "amplify-builds/moodboardKinesisReader-4934782b72546e51707a-build.zip"
+        },
+        "moodboardKinesisTrigger": {
+          "deploymentBucketName": "amplify-moodboard-x-x-deployment",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip"
         }
       },
       "api": {
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.outputs.json
index f918f22d4af..bf843b8f8db 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.outputs.json
@@ -1,6 +1,6 @@
 [
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventA0825010Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26041519-TableManagerCustomProvid-NL5jHnHA7UEk"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent3D6F955EArn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26042215-TableManagerCustomProvid-6RjxDx8a03Oj"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.parameters.json
index 3cd9be59202..a0cd1a0dd1f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.parameters.json
@@ -1,6 +1,6 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.template.json
index d0951c4b6dd..eb94a53bab1 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataAmplifyTableManagerNestedStackA-x.template.json
@@ -54,7 +54,7 @@
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                         {
                           "apiId": {
-                            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
                           },
                           "envName": "NONE"
                         }
@@ -64,7 +64,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -72,7 +72,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -80,7 +80,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     }
@@ -177,7 +177,7 @@
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                         {
                           "apiId": {
-                            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
                           },
                           "envName": "NONE"
                         }
@@ -187,7 +187,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -195,7 +195,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -203,7 +203,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
                         {
-                          "tableName": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tableName": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     }
@@ -495,7 +495,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNTQ6CMBBGz8K+jFjiAcTEpTFwADK0Iyk/bcK0EtP07gbQ1Xtf3uKTIC8FFBmunCs95pPpID6IPenGoxoFrtxGgzPE2k0kbi+78+kmoz7bPCyJCedOI8R7sMobZ7f29yS4bJGZPMN1g+ASqqBG8hUyJVETu7AoEnttPPbG9vvZLyRhnSYY+PSWEuQZimxgY/IlWG9mgvrgF13iClnPAAAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNTQ6CMBBGz8K+jAhyADFxaQwcgAztSMpPmzCtxDS9uwF09d6Xt/hyyMsMsgRXTqUa00l3EB7EjlTjUI4CV26DxhlCbScSt5fZ+bSTlp9tHhbFhHOnEMLdG+m0NVv7exRctMhMjuG6QXABlZcjuQqZoqiJrV8kib02Dntt+v3sF6IwVhEMfHrnFziXkCUDa50u3jg9E9QHv5aXuLnPAAAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
@@ -770,12 +770,12 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventA0825010Arn": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent3D6F955EArn": {
       "Value": {
         "Fn::GetAtt": [
           "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.outputs.json
index 1f73178a06b..b9a5431034b 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.outputs.json
@@ -1,22 +1,22 @@
 [
   {
     "OutputKey": "GetAttBoardTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:58:24.521",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:02:22.083",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:BoardTable:StreamArn"
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:BoardTable:StreamArn"
   },
   {
-    "OutputKey": "GetAttBoardTableName",
-    "OutputValue": "Board-g26hrobfy5b5pniveska5ylg4u-x",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:BoardTable:Name"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name",
+    "OutputValue": "BoardTable"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name",
-    "OutputValue": "BoardTable"
+    "OutputKey": "GetAttBoardTableName",
+    "OutputValue": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:BoardTable:Name"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-g26hrobfy5b5pniveska5ylg4u-x"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.parameters.json
index a8de795a1ab..80200958a48 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.parameters.json
@@ -4,43 +4,51 @@
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name",
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardfinish109465140FunctionId",
+    "ParameterValue": "icouahbk5vgh5p2mac7plk2vwy"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName",
     "ParameterValue": "NONE_DS"
   },
   {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26042215-TableManagerCustomProvid-6RjxDx8a03Oj"
   },
   {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardinit2702E6BCFFunctionId",
+    "ParameterValue": "7jfrpxn37jdqjdntkqp4uxcy5q"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26041519-TableManagerCustomProvid-NL5jHnHA7UEk"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.template.json
index d3df13b7a49..02a6d5de61a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataBoardNestedStackBoardNestedStac-x.template.json
@@ -37,22 +37,28 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardinit2702E6BCFFunctionId": {
+      "Type": "String"
+    },
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardfinish109465140FunctionId": {
       "Type": "String"
     }
   },
@@ -353,9 +359,9 @@
       "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA"
         },
-        "tableName": "Board-g26hrobfy5b5pniveska5ylg4u-x",
+        "tableName": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -461,7 +467,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -469,7 +475,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     }
@@ -487,7 +493,7 @@
             [
               "BoardIAMRolecda8e3-",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "-NONE"
             ]
@@ -518,7 +524,7 @@
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -573,10 +579,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetBoardauth0Function",
@@ -595,10 +601,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetBoardpostAuth0Function",
@@ -617,7 +623,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -647,7 +653,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "getBoard",
         "Kind": "PIPELINE",
@@ -679,7 +685,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -718,7 +724,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -730,11 +736,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -753,10 +759,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistBoardsauth0Function",
@@ -775,10 +781,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistBoardspostAuth0Function",
@@ -797,7 +803,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -808,10 +814,10 @@
         "FunctionVersion": "2018-05-29",
         "Name": "QueryListBoardsDataResolverFn",
         "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9cc8250e23b04d15695a56f00332d87510ed9ac872da532a0036b13bff682c8f.vtl"
         },
         "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/989c0229dcad6081b9d2d0627cfa7588cda06c6a29df81b8236bfd9a5beba7ce.vtl"
         }
       },
       "DependsOn": [
@@ -827,7 +833,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "listBoards",
         "Kind": "PIPELINE",
@@ -859,7 +865,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listBoards\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -898,7 +904,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -910,11 +916,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -933,10 +939,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateBoardinit0Function",
@@ -955,10 +961,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateBoardauth0Function",
@@ -977,10 +983,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateBoardpostAuth0Function",
@@ -999,7 +1005,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1029,7 +1035,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "createBoard",
         "Kind": "PIPELINE",
@@ -1041,6 +1047,9 @@
                 "FunctionId"
               ]
             },
+            {
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardinit2702E6BCFFunctionId"
+            },
             {
               "Fn::GetAtt": [
                 "MutationcreateBoardauth0FunctionMutationcreateBoardauth0FunctionAppSyncFunction70CF5FF3",
@@ -1058,6 +1067,9 @@
                 "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5",
                 "FunctionId"
               ]
+            },
+            {
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardfinish109465140FunctionId"
             }
           ]
         },
@@ -1067,7 +1079,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1106,7 +1118,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1118,11 +1130,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1141,10 +1153,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateBoardinit0Function",
@@ -1163,7 +1175,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1193,10 +1205,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateBoardpostAuth0Function",
@@ -1215,7 +1227,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1245,7 +1257,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "updateBoard",
         "Kind": "PIPELINE",
@@ -1283,7 +1295,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1322,7 +1334,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1334,11 +1346,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1357,7 +1369,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1387,10 +1399,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteBoardpostAuth0Function",
@@ -1409,7 +1421,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1439,7 +1451,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "deleteBoard",
         "Kind": "PIPELINE",
@@ -1471,7 +1483,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1510,7 +1522,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1522,11 +1534,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1545,10 +1557,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateBoardauth0Function",
@@ -1567,10 +1579,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateBoardpostAuth0Function",
@@ -1589,10 +1601,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateBoardDataResolverFn",
@@ -1613,7 +1625,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onCreateBoard",
         "Kind": "PIPELINE",
@@ -1645,7 +1657,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1657,7 +1669,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1669,11 +1681,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1692,10 +1704,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateBoardauth0Function",
@@ -1714,10 +1726,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateBoardpostAuth0Function",
@@ -1736,10 +1748,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateBoardDataResolverFn",
@@ -1760,7 +1772,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onUpdateBoard",
         "Kind": "PIPELINE",
@@ -1792,7 +1804,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1804,7 +1816,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1816,11 +1828,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1839,10 +1851,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteBoardauth0Function",
@@ -1861,10 +1873,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteBoardpostAuth0Function",
@@ -1883,10 +1895,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteBoardDataResolverFn",
@@ -1907,7 +1919,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onDeleteBoard",
         "Kind": "PIPELINE",
@@ -1939,7 +1951,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteBoard\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1951,7 +1963,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1963,11 +1975,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1985,7 +1997,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW6DQAxFz5L9xKVEPUAD6jKtoPvIzBg0ATxo7EkUIe5eQapUXX0/+cn+OeRvGWQ7vMneun4/+AbmE4mSqxVtb4qWvzDiSEpxhSKw8+oDm4okpGjJFEk0jH/Y8nPGm5xnd2ccg2vgG5uBjihkPI4wV2F42GGgxeA0yZ0tzOWml02JivXz5H/6SGzXEkXg1ncp4tbo9/NwpbgYOZxRhFTgfQ0jBzgm25OuBZbV/Uw6JTXbulbsPHeL4eAILvJyzXPIXyHbXcT7fUysfiSoHvkDBH3kWTYBAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WO0W6DMAxFv6XvwWN0/YAV1Mdtgr1XJjEoJSQodlpViH+foFOnPV0f+ci+BRSHHPId3jjTZsicbWH+IBYyjaAeVNn5L4w4klBcoQzeWLHBq5o4pKhJlYkljH/Y+eeMNz7P5u5xDKaFb2wdHZFJWRxhroN72MHRonCa+O41zNWmV22Fgs3z5H86Ja/XEmXwne1TxK3R72d3pbgo3p+RmYThfQ3FezgmPZCsBZbV/UwyJVHbuhHsre8X5YMhuPDLtXiD1wPkuwtbm8XkxY4E9SN/AM8IVrk2AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/Board/CDKMetadata/Default"
@@ -2008,7 +2020,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:BoardTable:StreamArn"
             ]
@@ -2018,14 +2030,14 @@
     },
     "GetAttBoardTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": "Board-g26hrobfy5b5pniveska5ylg4u-x",
+      "Value": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:BoardTable:Name"
             ]
@@ -2033,7 +2045,7 @@
         }
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name": {
       "Value": {
         "Fn::GetAtt": [
           "BoardDataSource",
@@ -2041,7 +2053,7 @@
         ]
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "BoardTable",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.parameters.json
index 233c4a31538..d2909e956e2 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.parameters.json
@@ -1,38 +1,38 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name",
-    "ParameterValue": "NONE_DS"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name",
+    "ParameterValue": "BoardTable"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name",
-    "ParameterValue": "BoardTable"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-g26hrobfy5b5pniveska5ylg4u-x"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name",
+    "ParameterValue": "MoodItemTable"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName",
+    "ParameterValue": "NONE_DS"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name",
-    "ParameterValue": "MoodItemTable"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.template.json
index e0048e10e23..d5f2902e231 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataConnectionStackNestedStackConne-x.template.json
@@ -4,10 +4,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "BoardmoodItemsauth0Function",
@@ -26,10 +26,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "BoardMoodItemsDataResolverFn",
@@ -50,7 +50,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "moodItems",
         "Kind": "PIPELINE",
@@ -76,7 +76,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Board\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"moodItems\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -92,7 +92,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn"
+                                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn"
                               }
                             ]
                           }
@@ -112,7 +112,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -124,11 +124,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -147,10 +147,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MoodItemboardauth0Function",
@@ -169,10 +169,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MoodItemBoardDataResolverFn",
@@ -193,7 +193,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "board",
         "Kind": "PIPELINE",
@@ -219,7 +219,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"MoodItem\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"board\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -235,7 +235,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn"
+                                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn"
                               }
                             ]
                           }
@@ -255,7 +255,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -267,11 +267,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -289,7 +289,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMQQ6CMBBA0bOwLyOWeAAhcekCDkDGMpACTgkzhRjC3Q26evmbb8HeMsgS3CR17ZhO/gX7k0SprRXdaHCTZpe8QRFSgfuJkRyK6EbSAoUMzrN82MFedvyI7NQHLgN3vo8LnmHKjiuSMK20HIf5PWrF3nN/GA4twSCX1VqwV8iSQbxPl8jq3wTV3y+0vrWSpwAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMQQ6CQAxA0bOwHyqCHEBIXLqAA5A6FFLADqEzEEO4u0FXL3/zU0jzBJIIN41tO8YTv2B/knpqa492NLhps2vWoCp5hfuJ0QyKYEfyBSoZnGf9iIW97OQRxHp2UjrpuA8LnmHKTipSN620HIf5PWqPPUt/GHEtwaCXNb3BNYckGpQ5XoJ4fhNUf79/ywdypwAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/ConnectionStack/CDKMetadata/Default"
@@ -564,31 +564,31 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.parameters.json
index 870ad7a4214..7fe8154d097 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.parameters.json
@@ -1,22 +1,22 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name",
-    "ParameterValue": "NONE_DS"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName",
+    "ParameterValue": "NONE_DS"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.template.json
index 63b5086ad43..2f87214921e 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataFunctionDirectiveStackNestedSta-x.template.json
@@ -278,7 +278,7 @@
     }
   },
   "Resources": {
-    "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceServiceRole33380CC2": {
+    "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceServiceRoleD998AB71": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -311,10 +311,10 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource/ServiceRole/Resource"
       }
     },
-    "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceServiceRoleDefaultPolicy038E7192": {
+    "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceServiceRoleDefaultPolicy1C99C4A3": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -364,24 +364,24 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceServiceRoleDefaultPolicy038E7192",
+        "PolicyName": "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceServiceRoleDefaultPolicy1C99C4A3",
         "Roles": [
           {
-            "Ref": "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceServiceRole33380CC2"
+            "Ref": "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceServiceRoleD998AB71"
           }
         ]
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource": {
+    "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "LambdaConfig": {
           "LambdaFunctionArn": {
@@ -399,10 +399,10 @@
             ]
           }
         },
-        "Name": "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource",
+        "Name": "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource",
         "ServiceRoleArn": {
           "Fn::GetAtt": [
-            "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceServiceRole33380CC2",
+            "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceServiceRoleD998AB71",
             "Arn"
           ]
         },
@@ -411,44 +411,44 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource/Resource"
       }
     },
-    "InvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceInvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceAppSyncFunction6A9B4777": {
+    "InvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceInvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceAppSyncFunctionD61577F1": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
-            "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource",
+            "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource",
             "Name"
           ]
         },
         "FunctionVersion": "2018-05-29",
-        "Name": "InvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource",
+        "Name": "InvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource",
         "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5c2d1cd3ae7dc20a398df3c83d9c785dd0b2edb2a1942563a1ff4295219149dd.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/422af41a5005a80e6b4c13548ad96f59761df8432b0ffbd594f1708d704dd183.vtl"
         },
         "ResponseMappingTemplateS3Location": {
           "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
         }
       },
       "DependsOn": [
-        "MoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource"
+        "MoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/InvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource/InvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSource.AppSyncFunction"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/InvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource/InvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSource.AppSyncFunction"
       }
     },
     "QuerygetRandomEmojiResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "getRandomEmoji",
         "Kind": "PIPELINE",
@@ -462,7 +462,7 @@
             },
             {
               "Fn::GetAtt": [
-                "InvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceInvokeMoodboardGetRandomEmojiGen2DgpvvcwecqLambdaDataSourceAppSyncFunction6A9B4777",
+                "InvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceInvokeMoodboardGetRandomEmojiGen2GckkokezwdLambdaDataSourceAppSyncFunctionD61577F1",
                 "FunctionId"
               ]
             }
@@ -478,7 +478,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
               {
@@ -486,11 +486,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
             ]
@@ -507,7 +507,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/queryGetRandomEmojiResolver"
       }
     },
-    "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceServiceRole692C21DC": {
+    "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceServiceRole9129BD29": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -540,10 +540,10 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource/ServiceRole/Resource"
       }
     },
-    "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceServiceRoleDefaultPolicy63704F63": {
+    "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceServiceRoleDefaultPolicy84F3A82F": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -593,24 +593,24 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceServiceRoleDefaultPolicy63704F63",
+        "PolicyName": "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceServiceRoleDefaultPolicy84F3A82F",
         "Roles": [
           {
-            "Ref": "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceServiceRole692C21DC"
+            "Ref": "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceServiceRole9129BD29"
           }
         ]
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource": {
+    "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "LambdaConfig": {
           "LambdaFunctionArn": {
@@ -628,10 +628,10 @@
             ]
           }
         },
-        "Name": "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource",
+        "Name": "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource",
         "ServiceRoleArn": {
           "Fn::GetAtt": [
-            "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceServiceRole692C21DC",
+            "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceServiceRole9129BD29",
             "Arn"
           ]
         },
@@ -640,44 +640,44 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource/Resource"
       }
     },
-    "InvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceInvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceAppSyncFunction5813D1AD": {
+    "InvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceInvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceAppSyncFunction1946DCC3": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
-            "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource",
+            "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource",
             "Name"
           ]
         },
         "FunctionVersion": "2018-05-29",
-        "Name": "InvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource",
+        "Name": "InvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSource",
         "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0d3a7858956bb086cfa5d0c642f2994abe7d4db49617921bbb896ad3bba17cd6.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b93b0b5bf36bcb3bad22c7ccea794aee261fe403d2ad20fe8fbf0717870b8d75.vtl"
         },
         "ResponseMappingTemplateS3Location": {
           "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
         }
       },
       "DependsOn": [
-        "MoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource"
+        "MoodboardKinesisReaderGen2GckkokezwdLambdaDataSource"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/InvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource/InvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSource.AppSyncFunction"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/InvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSource/InvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSource.AppSyncFunction"
       }
     },
     "QuerygetKinesisEventsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "getKinesisEvents",
         "Kind": "PIPELINE",
@@ -691,7 +691,7 @@
             },
             {
               "Fn::GetAtt": [
-                "InvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceInvokeMoodboardKinesisReaderGen2DgpvvcwecqLambdaDataSourceAppSyncFunction5813D1AD",
+                "InvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceInvokeMoodboardKinesisReaderGen2GckkokezwdLambdaDataSourceAppSyncFunction1946DCC3",
                 "FunctionId"
               ]
             }
@@ -707,7 +707,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
               {
@@ -715,11 +715,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
             ]
@@ -740,10 +740,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QueryGetRandomEmojiAuthFN",
@@ -762,10 +762,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QueryGetKinesisEventsAuthFN",
@@ -783,7 +783,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WO0WrDMAxFv6Xvjpa57APajD2NMZIPKKqjBDWOXCK7pYT8e7HLHvZ0dK90L7JgP2qod3jXyvVT5fkM6w9ppL6L6CbTDNIE6TlyEIN3Pa0e53OP8JXEZfOISgavV32Ig/W7LD8xYhfS4ijn/6u/XBNk4DEtWJqbQVrS4G+0bIZxhrUNvtwX/gbP7pHla9qM7k+oSlHhkGF0D8fkJor5n80Us4s4soybkdATXPTtZi3Yd6h3F2WuliSRZ4L2xSdsLuvcCwEAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW7DMAwE35K7zLpO84DGRU9FUdgPCBiJNhjLVGBKCQLDfy+koIeehrvkLthAc6ih3uFdK+umyvMZ1m/SSK6PaCfTDtIGcRw5iMG7nlaP89khfCax2TyiksHrVR9iYf0qyw+M2Ie0WMr5/+ov1wYZeEwLluZ2kI40+Bstm2GcYe2CL/eFP8GzfWT5nDaj+xOqUlR4zzC6h2OyE8X8z2aK2UccWcbNSHAEF325NW/weoB6d1HmakkSeSbonvwFp1tZPAsBAAA="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
@@ -792,19 +792,19 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.outputs.json
index 93144cb17c3..d7295e81f68 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.outputs.json
@@ -1,14 +1,14 @@
 [
   {
     "OutputKey": "GetAttKinesisEventCountTableName",
-    "OutputValue": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x",
+    "OutputValue": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:KinesisEventCountTable:Name"
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:KinesisEventCountTable:Name"
   },
   {
     "OutputKey": "GetAttKinesisEventCountTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:58:24.751",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:02:22.180",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:KinesisEventCountTable:StreamArn"
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:KinesisEventCountTable:StreamArn"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.parameters.json
index a8de795a1ab..25cd2f8112d 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.parameters.json
@@ -4,8 +4,20 @@
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name",
-    "ParameterValue": "NONE_DS"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26042215-TableManagerCustomProvid-6RjxDx8a03Oj"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -19,28 +31,16 @@
     "ParameterKey": "DynamoDBBillingMode",
     "ParameterValue": "PAY_PER_REQUEST"
   },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
-  },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName",
+    "ParameterValue": "NONE_DS"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26041519-TableManagerCustomProvid-NL5jHnHA7UEk"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.template.json
index debb2fbc03e..514d14a9f15 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataKinesisEventCountNestedStackKin-x.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Type": "String"
     }
   },
@@ -353,9 +353,9 @@
       "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA"
         },
-        "tableName": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x",
+        "tableName": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -461,7 +461,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -469,7 +469,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     }
@@ -487,7 +487,7 @@
             [
               "KinesisEventCountIAMaa7340-",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "-NONE"
             ]
@@ -518,7 +518,7 @@
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -573,10 +573,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetKinesisEventCountauth0Function",
@@ -595,10 +595,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetKinesisEventCountpostAuth0Function",
@@ -617,7 +617,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -647,7 +647,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "getKinesisEventCount",
         "Kind": "PIPELINE",
@@ -679,7 +679,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -718,7 +718,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -730,11 +730,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -753,10 +753,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistKinesisEventCountsauth0Function",
@@ -775,10 +775,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistKinesisEventCountspostAuth0Function",
@@ -797,7 +797,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -827,7 +827,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "listKinesisEventCounts",
         "Kind": "PIPELINE",
@@ -859,7 +859,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listKinesisEventCounts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -898,7 +898,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -910,11 +910,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -933,10 +933,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateKinesisEventCountinit0Function",
@@ -955,10 +955,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateKinesisEventCountauth0Function",
@@ -977,10 +977,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateKinesisEventCountpostAuth0Function",
@@ -999,7 +999,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1029,7 +1029,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "createKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1067,7 +1067,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1106,7 +1106,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1118,11 +1118,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1141,10 +1141,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateKinesisEventCountinit0Function",
@@ -1163,7 +1163,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1193,10 +1193,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateKinesisEventCountpostAuth0Function",
@@ -1215,7 +1215,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1245,7 +1245,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "updateKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1283,7 +1283,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1322,7 +1322,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1334,11 +1334,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1357,7 +1357,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1387,10 +1387,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteKinesisEventCountpostAuth0Function",
@@ -1409,7 +1409,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1439,7 +1439,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "deleteKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1471,7 +1471,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1510,7 +1510,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1522,11 +1522,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1545,10 +1545,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateKinesisEventCountauth0Function",
@@ -1567,10 +1567,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateKinesisEventCountpostAuth0Function",
@@ -1589,10 +1589,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateKinesisEventCountDataResolverFn",
@@ -1613,7 +1613,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onCreateKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1645,7 +1645,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1657,7 +1657,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1669,11 +1669,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1692,10 +1692,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateKinesisEventCountauth0Function",
@@ -1714,10 +1714,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateKinesisEventCountpostAuth0Function",
@@ -1736,10 +1736,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateKinesisEventCountDataResolverFn",
@@ -1760,7 +1760,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onUpdateKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1792,7 +1792,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1804,7 +1804,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1816,11 +1816,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1839,10 +1839,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteKinesisEventCountauth0Function",
@@ -1861,10 +1861,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteKinesisEventCountpostAuth0Function",
@@ -1883,10 +1883,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteKinesisEventCountDataResolverFn",
@@ -1907,7 +1907,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onDeleteKinesisEventCount",
         "Kind": "PIPELINE",
@@ -1939,7 +1939,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteKinesisEventCount\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1951,7 +1951,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1963,11 +1963,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1985,7 +1985,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW6DQAxFz5L9xKVEPUAD6jKtoPvIzBg0ATxo7EkUIe5eQapUXX0/+cn+OeRvGWQ7vMneun4/+AbmE4mSqxVtb4qWvzDiSEpxhSKw8+oDm4okpGjJFEk0jH/Y8nPGm5xnd2ccg2vgG5uBjihkPI4wV2F42GGgxeA0yZ0tzOWml02JivXz5H/6SGzXEkXg1ncp4tbo9/NwpbgYOZxRhFTgfQ0jBzgm25OuBZbV/Uw6JTXbulbsPHeL4eAILvJyzXPIXyHbXcT7fUysfiSoHvkDBH3kWTYBAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WO0W6DMAxFv6XvwWN0/YAV1Mdtgr1XJjEoJSQodlpViH+foFOnPV0f+ci+BRSHHPId3jjTZsicbWH+IBYyjaAeVNn5L4w4klBcoQzeWLHBq5o4pKhJlYkljH/Y+eeMNz7P5u5xDKaFb2wdHZFJWRxhroN72MHRonCa+O41zNWmV22Fgs3z5H86Ja/XEmXwne1TxK3R72d3pbgo3p+RmYThfQ3FezgmPZCsBZbV/UwyJVHbuhHsre8X5YMhuPDLtXiD1wPkuwtbm8XkxY4E9SN/AM8IVrk2AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/KinesisEventCount/CDKMetadata/Default"
@@ -2008,7 +2008,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:KinesisEventCountTable:StreamArn"
             ]
@@ -2018,14 +2018,14 @@
     },
     "GetAttKinesisEventCountTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x",
+      "Value": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:KinesisEventCountTable:Name"
             ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.outputs.json
index 7a6034f0741..45de6dca1eb 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.outputs.json
@@ -1,22 +1,22 @@
 [
   {
     "OutputKey": "GetAttMoodItemTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:57:22.278",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:01:20.197",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:MoodItemTable:StreamArn"
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:MoodItemTable:StreamArn"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name",
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name",
     "OutputValue": "MoodItemTable"
   },
   {
-    "OutputKey": "GetAttMoodItemTableName",
-    "OutputValue": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "lni7x3hwoncrhp3t6pnlk4wxtm:GetAtt:MoodItemTable:Name"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+    "OutputKey": "GetAttMoodItemTableName",
+    "OutputValue": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "p7wg7nhku5eq5bx6kble2s2x7q:GetAtt:MoodItemTable:Name"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.parameters.json
index a8de795a1ab..25cd2f8112d 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.parameters.json
@@ -4,8 +4,20 @@
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name",
-    "ParameterValue": "NONE_DS"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26042215-TableManagerCustomProvid-6RjxDx8a03Oj"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -19,28 +31,16 @@
     "ParameterKey": "DynamoDBBillingMode",
     "ParameterValue": "PAY_PER_REQUEST"
   },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
-  },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName",
+    "ParameterValue": "NONE_DS"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-moodboard26041519-TableManagerCustomProvid-NL5jHnHA7UEk"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.template.json
index 9bb646d849b..98efcdc9558 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-amplifyDataMoodItemNestedStackMoodItemNest-x.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Type": "String"
     }
   },
@@ -353,9 +353,9 @@
       "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA"
         },
-        "tableName": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x",
+        "tableName": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -487,7 +487,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     },
@@ -495,7 +495,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+                          "tablename": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
                         }
                       ]
                     }
@@ -513,7 +513,7 @@
             [
               "MoodItemIAMRoleceb4fa-",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "-NONE"
             ]
@@ -544,7 +544,7 @@
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -599,10 +599,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetMoodItemauth0Function",
@@ -621,10 +621,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetMoodItempostAuth0Function",
@@ -643,7 +643,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -673,7 +673,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "getMoodItem",
         "Kind": "PIPELINE",
@@ -705,7 +705,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -744,7 +744,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -756,11 +756,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -779,10 +779,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistMoodItemsauth0Function",
@@ -801,10 +801,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistMoodItemspostAuth0Function",
@@ -823,7 +823,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -853,7 +853,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "listMoodItems",
         "Kind": "PIPELINE",
@@ -885,7 +885,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listMoodItems\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -924,7 +924,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -936,11 +936,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -959,10 +959,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateMoodIteminit0Function",
@@ -981,10 +981,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateMoodItemauth0Function",
@@ -1003,10 +1003,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateMoodItempostAuth0Function",
@@ -1025,7 +1025,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1055,7 +1055,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "createMoodItem",
         "Kind": "PIPELINE",
@@ -1093,7 +1093,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1132,7 +1132,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1144,11 +1144,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1167,10 +1167,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateMoodIteminit0Function",
@@ -1189,7 +1189,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1219,10 +1219,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateMoodItempostAuth0Function",
@@ -1241,7 +1241,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1271,7 +1271,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "updateMoodItem",
         "Kind": "PIPELINE",
@@ -1309,7 +1309,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1348,7 +1348,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1360,11 +1360,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1383,7 +1383,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1413,10 +1413,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteMoodItempostAuth0Function",
@@ -1435,7 +1435,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1465,7 +1465,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "deleteMoodItem",
         "Kind": "PIPELINE",
@@ -1497,7 +1497,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1536,7 +1536,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1548,11 +1548,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1571,10 +1571,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateMoodItemauth0Function",
@@ -1593,10 +1593,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateMoodItempostAuth0Function",
@@ -1615,10 +1615,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateMoodItemDataResolverFn",
@@ -1639,7 +1639,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onCreateMoodItem",
         "Kind": "PIPELINE",
@@ -1671,7 +1671,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1683,7 +1683,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1695,11 +1695,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1718,10 +1718,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateMoodItemauth0Function",
@@ -1740,10 +1740,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateMoodItempostAuth0Function",
@@ -1762,10 +1762,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateMoodItemDataResolverFn",
@@ -1786,7 +1786,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onUpdateMoodItem",
         "Kind": "PIPELINE",
@@ -1818,7 +1818,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1830,7 +1830,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1842,11 +1842,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1865,10 +1865,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteMoodItemauth0Function",
@@ -1887,10 +1887,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteMoodItempostAuth0Function",
@@ -1909,10 +1909,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteMoodItemDataResolverFn",
@@ -1933,7 +1933,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "onDeleteMoodItem",
         "Kind": "PIPELINE",
@@ -1965,7 +1965,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteMoodItem\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1977,7 +1977,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1989,11 +1989,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -2012,10 +2012,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerymoodItemsByBoardIDauth0Function",
@@ -2034,10 +2034,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerymoodItemsByBoardIDpostAuth0Function",
@@ -2056,7 +2056,7 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -2086,7 +2086,7 @@
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         },
         "FieldName": "moodItemsByBoardID",
         "Kind": "PIPELINE",
@@ -2118,7 +2118,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"moodItemsByBoardID\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -2157,7 +2157,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -2169,11 +2169,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -2191,7 +2191,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW6DQAxFz5L9xKVEPUAD6jKtoPvIzBg0ATxo7EkUIe5eQapUXX0/+cn+OeRvGWQ7vMneun4/+AbmE4mSqxVtb4qWvzDiSEpxhSKw8+oDm4okpGjJFEk0jH/Y8nPGm5xnd2ccg2vgG5uBjihkPI4wV2F42GGgxeA0yZ0tzOWml02JivXz5H/6SGzXEkXg1ncp4tbo9/NwpbgYOZxRhFTgfQ0jBzgm25OuBZbV/Uw6JTXbulbsPHeL4eAILvJyzXPIXyHbXcT7fUysfiSoHvkDBH3kWTYBAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WO0W6DMAxFv6XvwWN0/YAV1Mdtgr1XJjEoJSQodlpViH+foFOnPV0f+ci+BRSHHPId3jjTZsicbWH+IBYyjaAeVNn5L4w4klBcoQzeWLHBq5o4pKhJlYkljH/Y+eeMNz7P5u5xDKaFb2wdHZFJWRxhroN72MHRonCa+O41zNWmV22Fgs3z5H86Ja/XEmXwne1TxK3R72d3pbgo3p+RmYThfQ3FezgmPZCsBZbV/UwyJVHbuhHsre8X5YMhuPDLtXiD1wPkuwtbm8XkxY4E9SN/AM8IVrk2AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/MoodItem/CDKMetadata/Default"
@@ -2214,7 +2214,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:MoodItemTable:StreamArn"
             ]
@@ -2224,14 +2224,14 @@
     },
     "GetAttMoodItemTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x",
+      "Value": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
               },
               "GetAtt:MoodItemTable:Name"
             ]
@@ -2239,7 +2239,7 @@
         }
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name": {
       "Value": {
         "Fn::GetAtt": [
           "MoodItemDataSource",
@@ -2247,7 +2247,7 @@
         ]
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "MoodItemTable",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.outputs.json
index 1ef1785be4a..7fee42ce780 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.outputs.json
@@ -3,14 +3,14 @@
     "OutputKey": "kinesisStreamId",
     "OutputValue": "moodboardKinesis-gen2-x"
   },
-  {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn",
-    "OutputValue": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
-  },
   {
     "OutputKey": "kinesisStreamShardCount",
     "OutputValue": "1"
   },
+  {
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn",
+    "OutputValue": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
+  },
   {
     "OutputKey": "kinesisStreamArn",
     "OutputValue": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
index a1318b02429..6599fcec5a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.parameters.json
@@ -1,10 +1,10 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
index c6ad9bf643f..52667a582b6 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-analytics5794DE4A-x.template.json
@@ -47,7 +47,7 @@
         "PolicyName": "moodboardKinesis-auth-policy-gen2-x",
         "Roles": [
           {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           }
         ]
       },
@@ -81,7 +81,7 @@
         "PolicyName": "moodboardKinesis-unauth-policy-gen2-x",
         "Roles": [
           {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           }
         ]
       },
@@ -94,7 +94,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQqDMAwA0LP432ZdwBP4v415AKlthFhbh0knQ7z7GPt6PARsHbjG72JDTHbhEY4biVLs1Ydk/C7DkbiQsEA3lV438tmwz7891oXD5zTdVO5VX1VPU9ZIMMvljQh4BdfMwmy3WpQzwfPvF8PdMhZ3AAAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXHUQ6CMAwA0LPwv9W5yAn4VyMHIHUrSRkbhnYSQ7i7MX69PA++deAa3MSGmOzMT9ivJEqxVwzJ4CbDnriQsEA3ll5XwmwY82/3ZebwOUw3llvVV9XDlCUSTHJ6+wucW3DNJMx2rUU5Ezz+fgEIqID2dwAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/analytics/CDKMetadata/Default"
@@ -119,7 +119,7 @@
     "kinesisStreamShardCount": {
       "Value": "1"
     },
-    "amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+    "amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
       "Value": {
         "Fn::GetAtt": [
           "moodboardKinesisKinesisStreamD5E97047",
@@ -395,10 +395,10 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.outputs.json
index bbd31578eb8..9cf657c8bba 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.outputs.json
@@ -1,22 +1,22 @@
 [
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref",
-    "OutputValue": "us-east-1_5iU0nP22B"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref",
+    "OutputValue": "us-east-1_S5zs48BQ8"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "OutputValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "OutputValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "OutputValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef",
+    "OutputValue": "q6pv2fdcs4s7to7ocp8th73n4"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref",
-    "OutputValue": "6dkse6kuhg779dhl6glmefrmrq"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "OutputValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "OutputValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "OutputValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
index 1f4b97ac3d6..9621bed2c65 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-auth179371D7-x.template.json
@@ -328,7 +328,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK0BP0B68iLS4llisuq26Qaa1SIh/y5Fqj3NzJsZDXpXQVWYKZbW9aWnK6QjRkHXirG9MlO8JBvuTBIgnSOOpxC8qm/884upPSHLuvqTg0MWkvdyXucmeNyLGPsYkCUrMgOkGc7DWXPOioND6OLmpTXoLVRFF4nK8clCA0Lz1Q/RUZAezgAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WZHIBxhOXoyBeDa1XXWhbBO6SkzTfzfEoJxm5s1MCWVVQJHpKeTG9rmjK8QjBkHbija90lO4ROPvTOIhngOOJ++dqm/884upHSHLuvqTg0UWkvdyXufGO9yLaPMYkCUp0gPEGc7DWVNKir1F6MLmVe5gW0GRdYEoH58sNCA0X/0AGiQi/s4AAAA="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/auth/CDKMetadata/Default"
@@ -603,27 +603,27 @@
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
       "Value": {
         "Ref": "amplifyAuthUserPool4BA7F805"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef": {
       "Value": {
         "Ref": "amplifyAuthUserPoolAppClient2626C6F8"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Value": {
         "Ref": "amplifyAuthIdentityPool3FDE84CC"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Value": {
         "Ref": "amplifyAuthauthenticatedUserRoleD8DA3689"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Value": {
         "Ref": "amplifyAuthunauthenticatedUserRole2B524D9E"
       }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.outputs.json
index c6aa0bf7f96..d1c9f6176d7 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.outputs.json
@@ -1,18 +1,18 @@
 [
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey",
-    "OutputValue": "da2-fakeapikey00000000000000"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "OutputValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB1CECC87FDestinationBucketArn",
-    "OutputValue": "arn:aws:s3:::amplify-moodboard26041519-amplifydataamplifycodege-ytkavmopvf6i"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey",
+    "OutputValue": "da2-fakeapikey00000000000000"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl",
-    "OutputValue": "https://mpfp3754i5h4livlltnjpjrfla.appsync-api.us-east-1.amazonaws.com/graphql"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl",
+    "OutputValue": "https://nbzf77kjhrhd7filvpc2wcgi3a.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "OutputValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB6C2E9844DestinationBucketArn",
+    "OutputValue": "arn:aws:s3:::amplify-moodboard26042215-amplifydataamplifycodege-1xk29fatbprq"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.parameters.json
index fa4bf68634d..357d1db1687 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.parameters.json
@@ -3,6 +3,14 @@
     "ParameterKey": "DynamoDBModelTableReadIOPS",
     "ParameterValue": "5"
   },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
+  },
+  {
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref",
+    "ParameterValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
+  },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
     "ParameterValue": "true"
@@ -16,23 +24,15 @@
     "ParameterValue": "PAY_PER_REQUEST"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref",
-    "ParameterValue": "us-east-1_5iU0nP22B"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref",
+    "ParameterValue": "us-east-1_S5zs48BQ8"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
     "ParameterValue": "5"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref",
-    "ParameterValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
-  },
-  {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.template.json
index d37573057d5..57be5519eb4 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-data7552DF31-x.template.json
@@ -12,7 +12,7 @@
                 "Ref": "AWS::Region"
               },
               "UserPoolId": {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref"
               }
             }
           }
@@ -69,7 +69,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807834250
+        "Expires": 1808424758
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -99,7 +99,7 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
@@ -136,7 +136,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/c92abf5f5fe3be82fd8b4be45fd5752b46f4b5aab9163f01d79d1438f8e0b2b6.json"
+              "/a653cdef8775a410507415cd2b8ab1271204695582158b0ec42cbcee271137ae.json"
             ]
           ]
         }
@@ -145,7 +145,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerC23F7C4A.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManager303EA05C.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -168,32 +168,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventA0825010Arn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent3D6F955EArn"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
           }
         },
         "Tags": [
@@ -226,7 +226,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/ab8ac10686eaa9be64f5479d98f4e70ad661e882d5822b53d081cebeb3869e47.json"
+              "/b47e043af6db63beb2edfaa1c8c1a08f8b7660908ce38111b5f3bb4ae3c027a7.json"
             ]
           ]
         }
@@ -238,7 +238,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/MoodItem.NestedStack/MoodItem.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItem684502EA.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItem2C36B237.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -261,32 +261,44 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventA0825010Arn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent3D6F955EArn"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
+          },
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardinit2702E6BCFFunctionId": {
+            "Fn::GetAtt": [
+              "MutationcreateBoardinit28578A7E4",
+              "FunctionId"
+            ]
+          },
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataMutationcreateBoardfinish109465140FunctionId": {
+            "Fn::GetAtt": [
+              "MutationcreateBoardfinish1EF8A71FF",
+              "FunctionId"
+            ]
           }
         },
         "Tags": [
@@ -319,7 +331,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/170425ccf15f62ef45ba178f4b2734987a5ae1db4045578d1e91fc31d14edf8a.json"
+              "/93270fb69213b289f250fee37efbced4c05edf3a3ebd5d9e59a87bb05b54ec7f.json"
             ]
           ]
         }
@@ -331,7 +343,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/Board.NestedStack/Board.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardFD292231.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardED2B10B0.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -354,32 +366,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceEDAFB4EEOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTable155EE028": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72941075Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableAAD967CA": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventA0825010Arn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent3D6F955EArn"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
           }
         },
         "Tags": [
@@ -412,7 +424,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/15fe43ea2a271e4f7497ea4ec44bffd92ada32d743a9d00c1d1f4eba73fb3aaf.json"
+              "/624e1f1a23ee48e4e29c0e59898e3c2842db1b6aca931cfc3178b7e0a2b01e2d.json"
             ]
           ]
         }
@@ -424,7 +436,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/KinesisEventCount.NestedStack/KinesisEventCount.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataKinesisEventCountC7888BAB.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataKinesisEventCountFB8CF696.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -432,22 +444,22 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
@@ -484,7 +496,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/2bc7c6559ee852d684360aa255bb5a28612c0fe5418ce2e4fcaccf0753d277b1.json"
+              "/e0fd593db9e38ebff1d76d143f81cfce8ca578e86ff7872858b402ffb8cf471b.json"
             ]
           ]
         }
@@ -496,7 +508,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataFunctionDirectiveStackFF0225C2.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataFunctionDirectiveStack80F5FFDC.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -504,49 +516,49 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPINONEDS3FF4CBF7Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPINONEDS1E23F69EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name": {
             "Fn::GetAtt": [
               "amplifyDataMoodItemNestedStackMoodItemNestedStackResource4E6CE7C0",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemDataSource92236A55Name"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemDataSource140F4B39Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemNestedStackMoodItemNestedStackResource1B190385Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemNestedStackMoodItemNestedStackResourceCFCB8006Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn": {
             "Fn::GetAtt": [
               "amplifyDataMoodItemNestedStackMoodItemNestedStackResource4E6CE7C0",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataMoodItemMoodItemTable596E9348TableArn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataMoodItemMoodItemTable7128F053TableArn"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name": {
             "Fn::GetAtt": [
               "amplifyDataBoardNestedStackBoardNestedStackResourceC5F2D278",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardDataSourceED4EAD30Name"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardDataSourceAC357D83Name"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardNestedStackBoardNestedStackResource06103DCFOutputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardNestedStackBoardNestedStackResource0B8AE288Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn": {
             "Fn::GetAtt": [
               "amplifyDataBoardNestedStackBoardNestedStackResourceC5F2D278",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataBoardBoardTable05921B50TableArn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataBoardBoardTable04BEC2D2TableArn"
             ]
           }
         },
@@ -580,7 +592,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/0840d25cfd394af872b7fedd94bccf8f0fed274bd191218f39fea5a55b236028.json"
+              "/ec26d897ca1e2947012ab5e56d7bb3af395ca3678f1b544d8e7c8b949823541f.json"
             ]
           ]
         }
@@ -594,7 +606,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14dataamplifyDataConnectionStackE06AF98B.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataConnectionStackC1FEC624.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -642,7 +654,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:c2c39317",
+            "Key": "aws-cdk:cr-owned:a797f25e",
             "Value": "true"
           },
           {
@@ -771,7 +783,7 @@
           }
         ],
         "SourceObjectKeys": [
-          "86a5216a6a33ec3ee1d9c73c639f089127a432b38fcd622bd4fcd6b5f3c06bcb.zip"
+          "dfd58c8e01228244d70da4e6a84a83a99f53b4f3e44b2c95890d07e9ba14be39.zip"
         ],
         "SourceMarkers": [
           {}
@@ -795,6 +807,24 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
       }
     },
+    "amplifyDataL2GraphqlApinoneD379C54A": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "Name": "none",
+        "Type": "NONE"
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/amplifyData/L2GraphqlApi/none/Resource"
+      }
+    },
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
       "Type": "AWS::IAM::Role",
       "Properties": {
@@ -1113,7 +1143,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:0cccd1bc",
+            "Key": "aws-cdk:cr-owned:b934be87",
             "Value": "true"
           },
           {
@@ -1369,10 +1399,58 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
       }
     },
+    "MutationcreateBoardinit28578A7E4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": "none",
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardinit2",
+        "RequestMappingTemplate": "## [Start] Custom init slot - Auto-prefix board name with time-of-day emoji. **\n## This runs after init.1 (which sets id, createdAt, updatedAt).\n## We read the hour from createdAt and prepend a matching emoji to the board name.\n\n#set( $createdAt = $ctx.stash.defaultValues.createdAt )\n#set( $hour = $util.parseInt($util.time.parseISO8601ToEpochMilliSeconds($createdAt)) )\n## Convert epoch millis to approximate hour (UTC)\n#set( $hourOfDay = $hour / 3600000 % 24 )\n\n#if( $hourOfDay >= 5 && $hourOfDay < 12 )\n  #set( $emoji = \"?\" )\n#elseif( $hourOfDay >= 12 && $hourOfDay < 18 )\n  #set( $emoji = \"??\" )\n#else\n  #set( $emoji = \"?\" )\n#end\n\n## Prepend the emoji to the board name\n#set( $inputName = $util.defaultIfNull($ctx.args.input.name, \"\") )\n$util.qr($ctx.stash.defaultValues.put(\"name\", \"${emoji} ${inputName}\"))\n\n$util.toJson({\n  \"version\": \"2018-05-29\",\n  \"payload\": {}\n})\n## [End] Custom init slot - Auto-prefix board name with time-of-day emoji. **\n",
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)"
+      },
+      "DependsOn": [
+        "amplifyDataL2GraphqlApinoneD379C54A"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/MutationcreateBoardinit2/Resource"
+      }
+    },
+    "MutationcreateBoardfinish1EF8A71FF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": "none",
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardfinish1",
+        "RequestMappingTemplate": "$util.toJson({})",
+        "ResponseMappingTemplate": "## [Start] Custom finish slot - Append \"(new!)\" tag to board name in response. **\n## This runs as the final step before the response is returned to the client.\n## It adds a visual indicator that the board was just created.\n\n#if( $ctx.error )\n  $util.error($ctx.error.message, $ctx.error.type)\n#end\n\n#if( !$util.isNullOrEmpty($ctx.prev.result) )\n  #set( $result = $ctx.prev.result )\n  #if( !$util.isNullOrEmpty($result.name) )\n    $util.qr($result.put(\"name\", \"${result.name} (new!)\"))\n  #end\n  $util.toJson($result)\n#else\n  $util.toJson($ctx.prev.result)\n#end\n## [End] Custom finish slot - Append \"(new!)\" tag to board name in response. **\n"
+      },
+      "DependsOn": [
+        "amplifyDataL2GraphqlApinoneD379C54A"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/MutationcreateBoardfinish1/Resource"
+      }
+    },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSwW7bMAz9luasaKmLXXZzHayHFV0WA7sMRcDITMpEljyRbmYI/vdBVpt026nYiY+P5vN7EAtdfFzoxRWceG6a49zSVscHZMGmFjBHtUb2fTCo4MSbCF3HgzM63gXonn7asqNbYFTVzk3Mt/uyozddbZ6whUSUHX3BQT14h0sQqLNotXOXblR8s4nAjMK6TEU12Fk/tOhE3/bmiLI8E+lrHTM7ecgwSWb0I85a+kVu9mn2Nl3KwTd6GvGLatmLX6JFwa/bAxrh2aj+a/vxxc3KWzLDxVPu3+EsL9QCgin0+4z9u/w4KgvttgEdq527hwHDdwxM3qma3N6iePe5d0YScwbV7kyOiqDVce3t9HhTvYTMaFTMrY61BHL7FQRoUTBM89dmHNX0wLXAntw+zfK5VT2Lb89Hl37xirPxjU2mN3BiY0mXJ64sTTn+0P9LZxX8MzUY0p2MyvkG9YE/PBeFLq714urARPPQO6EW9TrX3x7hnsYZAwAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1Z0bJ0vezmOtgOK7o0BnYZioCRGZeJPlxRbmYI/u+DrCbN2l6KnfgeaT49mpzL+dVMzi7gwFNV76eaNjLeIgesqwBqL1bIrvMKBRx4HaFtubdKxu8e2odHXbR0DYyi3Noxc3dTtHTGKvWABlKiaOkH9uLWWVxAgCqLllt7xoqs/q2zKpCzqXrEpbNbajoPiQyCL9cRmDGwLFIQNbba9QZtkNed2mNYnBLpaxlzdjSbYVLP6HecGPpDdvJ1cv4b0sB8KccSP6sWXXAL1Bjw52aHKvBkEP/Vff/sZuk0qf7FU+YfcJYbqgAB09AfM/a2+X4QGsymBhnLrb2BHv0v9Jy2UpFtNAZ32o14b2GDIDAyrpwetzzGlyEzGgSzkbEKnmyzBA8GA/qxfiTDIMYFVwEask2q5bssOw7OnK4zPXHE2fhaJ9NrOLDSJIsDl5rGOf7Rf6Wz9O6JavTpTgZhXY1yx5+e5l/k5ys5u9gx0dR3NpBBucrxLwWGNBpCAwAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data/CDKMetadata/Default"
@@ -1418,16 +1496,16 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
       "Type": "String"
     }
   },
@@ -1698,7 +1776,7 @@
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -1706,7 +1784,7 @@
         ]
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -1714,7 +1792,7 @@
         ]
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB1CECC87FDestinationBucketArn": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB6C2E9844DestinationBucketArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
@@ -1722,7 +1800,7 @@
         ]
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey": {
+    "amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.outputs.json
index 98186393b37..f4e37c975ec 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.outputs.json
@@ -1,14 +1,14 @@
 [
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisTriggergen2xlambda7EBA9517Ref",
-    "OutputValue": "moodboardKinesisTrigger-gen2-x"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisReadergen2xlambdaF592F734Ref",
+    "OutputValue": "moodboardKinesisReader-gen2-x"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisReadergen2xlambda2566B4CDRef",
-    "OutputValue": "moodboardKinesisReader-gen2-x"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisTriggergen2xlambda99911AACRef",
+    "OutputValue": "moodboardKinesisTrigger-gen2-x"
   },
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14functionmoodboardGetRandomEmojigen2xlambda9EA3D3D3Ref",
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565functionmoodboardGetRandomEmojigen2xlambdaDCDC903DRef",
     "OutputValue": "moodboardGetRandomEmoji-gen2-x"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.parameters.json
index b3d2a2a1fa9..d5503aaafad 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.parameters.json
@@ -1,18 +1,18 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn",
-    "ParameterValue": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl",
+    "ParameterValue": "https://nbzf77kjhrhd7filvpc2wcgi3a.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl",
-    "ParameterValue": "https://mpfp3754i5h4livlltnjpjrfla.appsync-api.us-east-1.amazonaws.com/graphql"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn",
+    "ParameterValue": "arn:aws:kinesis:us-east-1:123456789012:stream/moodboardKinesis-gen2-x"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId",
-    "ParameterValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId",
+    "ParameterValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey",
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey",
     "ParameterValue": "da2-fakeapikey00000000000000"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.template.json
index 426b6498574..f9dd9078c6f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-function1351588B-x.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"AmplifySandbox\",\"createdWith\":\"1.18.0\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
   "Resources": {
-    "moodboardGetRandomEmojigen2xlambdaServiceRole8242E4D1": {
+    "moodboardGetRandomEmojigen2xlambdaServiceRole8C98ABEE": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -51,7 +51,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardGetRandomEmoji-gen2-x-lambda/ServiceRole/Resource"
       }
     },
-    "moodboardGetRandomEmojigen2xlambdaC83AD738": {
+    "moodboardGetRandomEmojigen2xlambdaF1EBDE4F": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -78,7 +78,7 @@
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "moodboardGetRandomEmojigen2xlambdaServiceRole8242E4D1",
+            "moodboardGetRandomEmojigen2xlambdaServiceRole8C98ABEE",
             "Arn"
           ]
         },
@@ -100,7 +100,7 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "moodboardGetRandomEmojigen2xlambdaServiceRole8242E4D1"
+        "moodboardGetRandomEmojigen2xlambdaServiceRole8C98ABEE"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -111,7 +111,7 @@
         "aws:asset:property": "Code"
       }
     },
-    "moodboardKinesisReadergen2xlambdaServiceRole1C2EBAAD": {
+    "moodboardKinesisReadergen2xlambdaServiceRoleF2B28A66": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -161,7 +161,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisReader-gen2-x-lambda/ServiceRole/Resource"
       }
     },
-    "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicyFB6EB8D0": {
+    "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicy38AD6253": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -182,16 +182,16 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn"
               }
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicyFB6EB8D0",
+        "PolicyName": "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicy38AD6253",
         "Roles": [
           {
-            "Ref": "moodboardKinesisReadergen2xlambdaServiceRole1C2EBAAD"
+            "Ref": "moodboardKinesisReadergen2xlambdaServiceRoleF2B28A66"
           }
         ]
       },
@@ -201,7 +201,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisReader-gen2-x-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "moodboardKinesisReadergen2xlambda3F90BD3F": {
+    "moodboardKinesisReadergen2xlambda57848FA2": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -211,7 +211,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "684b20135d918afb02e1e75d4aec62020d2c54a7a2208aee4e7840b781f29694.zip"
+          "S3Key": "fcb42877b913834d6f02a38f9f51bbbe45374e31f9f617b0631bce246a5761b0.zip"
         },
         "Environment": {
           "Variables": {
@@ -219,7 +219,7 @@
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "ANALYTICS_MOODBOARDKINESIS_KINESISSTREAMARN": {
-              "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn"
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn"
             }
           }
         },
@@ -231,7 +231,7 @@
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "moodboardKinesisReadergen2xlambdaServiceRole1C2EBAAD",
+            "moodboardKinesisReadergen2xlambdaServiceRoleF2B28A66",
             "Arn"
           ]
         },
@@ -253,19 +253,19 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicyFB6EB8D0",
-        "moodboardKinesisReadergen2xlambdaServiceRole1C2EBAAD"
+        "moodboardKinesisReadergen2xlambdaServiceRoleDefaultPolicy38AD6253",
+        "moodboardKinesisReadergen2xlambdaServiceRoleF2B28A66"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisReader-gen2-x-lambda/Resource",
-        "aws:asset:path": "asset.684b20135d918afb02e1e75d4aec62020d2c54a7a2208aee4e7840b781f29694",
+        "aws:asset:path": "asset.fcb42877b913834d6f02a38f9f51bbbe45374e31f9f617b0631bce246a5761b0",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "moodboardKinesisTriggergen2xlambdaServiceRole37AECA7D": {
+    "moodboardKinesisTriggergen2xlambdaServiceRoleC4787B38": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -315,7 +315,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisTrigger-gen2-x-lambda/ServiceRole/Resource"
       }
     },
-    "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyCDA80007": {
+    "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyC73800EA": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -341,7 +341,7 @@
                     },
                     ":apis/",
                     {
-                      "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+                      "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
                     },
                     "/types/Mutation/*"
                   ]
@@ -361,16 +361,16 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn"
+                "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn"
               }
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyCDA80007",
+        "PolicyName": "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyC73800EA",
         "Roles": [
           {
-            "Ref": "moodboardKinesisTriggergen2xlambdaServiceRole37AECA7D"
+            "Ref": "moodboardKinesisTriggergen2xlambdaServiceRoleC4787B38"
           }
         ]
       },
@@ -380,7 +380,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisTrigger-gen2-x-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "moodboardKinesisTriggergen2xlambdaF47A5413": {
+    "moodboardKinesisTriggergen2xlambdaC124FDAF": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -390,7 +390,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "fb9f3ee6f7d633925e11bee2ee096213ad4244c2eda75740a0785ef9996e6b28.zip"
+          "S3Key": "8feb77d9803f047940821a1cd8809a46cbacefb83a65bea415a0f88626829e34.zip"
         },
         "Environment": {
           "Variables": {
@@ -398,13 +398,13 @@
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "API_MOODBOARD_GRAPHQLAPIKEYOUTPUT": {
-              "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey"
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey"
             },
             "API_MOODBOARD_GRAPHQLAPIENDPOINTOUTPUT": {
-              "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl"
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl"
             },
             "API_MOODBOARD_GRAPHQLAPIIDOUTPUT": {
-              "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+              "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
             }
           }
         },
@@ -416,7 +416,7 @@
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "moodboardKinesisTriggergen2xlambdaServiceRole37AECA7D",
+            "moodboardKinesisTriggergen2xlambdaServiceRoleC4787B38",
             "Arn"
           ]
         },
@@ -438,27 +438,27 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyCDA80007",
-        "moodboardKinesisTriggergen2xlambdaServiceRole37AECA7D"
+        "moodboardKinesisTriggergen2xlambdaServiceRoleDefaultPolicyC73800EA",
+        "moodboardKinesisTriggergen2xlambdaServiceRoleC4787B38"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisTrigger-gen2-x-lambda/Resource",
-        "aws:asset:path": "asset.fb9f3ee6f7d633925e11bee2ee096213ad4244c2eda75740a0785ef9996e6b28",
+        "aws:asset:path": "asset.8feb77d9803f047940821a1cd8809a46cbacefb83a65bea415a0f88626829e34",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "moodboardKinesisTriggergen2xlambdaKinesisEventSourceamplifymoodboarde2esandbox685dc54d14functionKinesisStreamB7B9DD1903C7F872": {
+    "moodboardKinesisTriggergen2xlambdaKinesisEventSourceamplifymoodboarde2esandbox4f6bc84565functionKinesisStream05902EB8FF33954D": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn"
+          "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn"
         },
         "FunctionName": {
-          "Ref": "moodboardKinesisTriggergen2xlambdaF47A5413"
+          "Ref": "moodboardKinesisTriggergen2xlambdaC124FDAF"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -479,13 +479,13 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisTrigger-gen2-x-lambda/KinesisEventSource:amplifymoodboarde2esandbox685dc54d14functionKinesisStreamB7B9DD19/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/moodboardKinesisTrigger-gen2-x-lambda/KinesisEventSource:amplifymoodboarde2esandbox4f6bc84565functionKinesisStream05902EB8/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOTQqDQAxGz+J+TO1ID1Cl3bUUPYDEMcr4M1PMqBTx7mUUuunqfUk+HpEgLxFEAS4cqqoLe13C+iR2VOUOVSdw4WLtcSgrLIytqGV47rhPRjltjdA4wJrZnkRam50v22v18eORNsFxgczkGK4egmNIJtWRS5BJHHpY09r8rLeZjMvtNCp64PutTeN9/9ttE7syd9j4Uka8nzfhv4WWT7OUIM8QBS1rHY6TcXogyA5+Acyly50AAQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOTQ6CMBBGz+K+jAhyADG60xg4ABna0ZSfljgFYhrubgqJG1fvm5kvL5NAksUQ73DmSKo26nQN/k7sSJUOZStw5sp32NcKK2MVNQz3FdfRSKetERp78IXtSJyfZuXDdlp+wrilRXBaITM5hlOA4BTyUbbkcmQSmx78+Wl+1stExpV2fEu64TBo8wq+/+2yiFVZOnyFUkG8nhcRvoWG91NyhEMG8a5hraP3aJzuCYqNXwfQeX0AAQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function/CDKMetadata/Default"
@@ -760,33 +760,33 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14functionmoodboardGetRandomEmojigen2xlambda9EA3D3D3Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565functionmoodboardGetRandomEmojigen2xlambdaDCDC903DRef": {
       "Value": {
-        "Ref": "moodboardGetRandomEmojigen2xlambdaC83AD738"
+        "Ref": "moodboardGetRandomEmojigen2xlambdaF1EBDE4F"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisReadergen2xlambda2566B4CDRef": {
+    "amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisReadergen2xlambdaF592F734Ref": {
       "Value": {
-        "Ref": "moodboardKinesisReadergen2xlambda3F90BD3F"
+        "Ref": "moodboardKinesisReadergen2xlambda57848FA2"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisTriggergen2xlambda7EBA9517Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisTriggergen2xlambda99911AACRef": {
       "Value": {
-        "Ref": "moodboardKinesisTriggergen2xlambdaF47A5413"
+        "Ref": "moodboardKinesisTriggergen2xlambdaC124FDAF"
       }
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.outputs.json
index 649650f2271..b285efb45e8 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.outputs.json
@@ -1,6 +1,6 @@
 [
   {
-    "OutputKey": "amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref",
-    "OutputValue": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+    "OutputKey": "amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef",
+    "OutputValue": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
index a1318b02429..6599fcec5a5 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.parameters.json
@@ -1,10 +1,10 @@
 [
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthunauthenticate-Six3YvIOxgGy"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthauthenticatedU-kysyAl3WUL5W"
   },
   {
-    "ParameterKey": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref",
-    "ParameterValue": "amplify-moodboard26041519-amplifyAuthauthenticatedU-hG08sRlsZcsb"
+    "ParameterKey": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef",
+    "ParameterValue": "amplify-moodboard26042215-amplifyAuthunauthenticate-6uKlXRpRthU1"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
index 3a1fb5f0a02..7c511871885 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x-storage0EC3F24A-x.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"AmplifySandbox\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
   "Resources": {
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketEncryption": {
@@ -65,11 +65,11 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy3B9C9171": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy1D08013C": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
         "Bucket": {
-          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
         },
         "PolicyDocument": {
           "Statement": [
@@ -87,7 +87,7 @@
               "Resource": [
                 {
                   "Fn::GetAtt": [
-                    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                     "Arn"
                   ]
                 },
@@ -97,7 +97,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -126,7 +126,7 @@
               "Resource": [
                 {
                   "Fn::GetAtt": [
-                    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                     "Arn"
                   ]
                 },
@@ -136,7 +136,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -156,7 +156,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x/Bucket/Policy/Resource"
       }
     },
-    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResourceD9B4EAB6": {
+    "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketAutoDeleteObjectsCustomResource27E2B2D3": {
       "Type": "Custom::S3AutoDeleteObjects",
       "Properties": {
         "ServiceToken": {
@@ -166,11 +166,11 @@
           ]
         },
         "BucketName": {
-          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
         }
       },
       "DependsOn": [
-        "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy3B9C9171"
+        "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucketPolicy1D08013C"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
@@ -230,7 +230,7 @@
             [
               "Lambda function for auto-deleting objects in ",
               {
-                "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+                "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
               },
               " S3 bucket."
             ]
@@ -248,26 +248,26 @@
         "aws:asset:property": "Code"
       }
     },
-    "MOODBOARD20E29595008142E3AD16F01C4066E1C47DE24GEN2DGPVVCWECQBUCKETNAMEParameterB3838DF7": {
+    "MOODBOARD20E29595008142E3AD16F01C4066E1C4AA2CCGEN2GCKKOKEZWDBUCKETNAMEParameter6DDF0413": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/moodboard/e2e-sandbox-x/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAME",
         "Tags": {
           "amplify:deployment-type": "sandbox",
           "created-by": "amplify"
         },
         "Type": "String",
         "Value": {
-          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+          "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
         }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_47_DE_24_GEN_2_DGPVVCWECQ_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/MOODBOARD_20_E_29595008142_E_3_AD_16_F_01_C_4066_E_1_C_4_AA_2_CC_GEN_2_GCKKOKEZWD_BUCKET_NAMEParameter/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -281,7 +281,7 @@
                   [
                     {
                       "Fn::GetAtt": [
-                        "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                        "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                         "Arn"
                       ]
                     },
@@ -303,7 +303,7 @@
               "Effect": "Allow",
               "Resource": {
                 "Fn::GetAtt": [
-                  "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                  "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                   "Arn"
                 ]
               }
@@ -311,10 +311,10 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess3589DB9D8",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess39CBEE75D",
         "Roles": [
           {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
           }
         ]
       },
@@ -324,7 +324,7 @@
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/amplify-moodboard-e2e-sandbox-x--storageAccess3/Resource"
       }
     },
-    "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654": {
+    "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -339,7 +339,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -353,7 +353,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -367,7 +367,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -387,7 +387,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -401,7 +401,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -415,7 +415,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -442,7 +442,7 @@
               "Effect": "Allow",
               "Resource": {
                 "Fn::GetAtt": [
-                  "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                  "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                   "Arn"
                 ]
               }
@@ -457,7 +457,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -471,7 +471,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -485,7 +485,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200",
+                          "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD",
                           "Arn"
                         ]
                       },
@@ -498,10 +498,10 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifymoodboarde2esandbox685dc54d14storageAccess459CF4654",
+        "PolicyName": "amplifymoodboarde2esandbox4f6bc84565storageAccess4BDF7588B",
         "Roles": [
           {
-            "Ref": "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+            "Ref": "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
           }
         ]
       },
@@ -514,7 +514,7 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3pxIXbNs5QrccJoSw1ldsmkWJ3G4ry31EXicKRk1/reT9qqJ8qqDb6yqXpxnKiM8RXZMGuFW1Gpa/8EXkLcT+bEUUdPl1Wp1hYupErnovf4cXPW7gjhmzdzeJfcELBt/OARrhI7yqjxk9kvtbW/P+jOwda0YIW3b06KWYLsZVArm900BYFw7Lx8yRF2kJc17NKSR1mFm+PyH4OBhe06j+oCf5CHYa9ZlQ7ZpRWdE+uT8r5DmHgh0tdQ/0I1WZgojLMTsgiHPP9BuZ0Chp6AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNTU/DMAyGf8t6Tk3p2IXbNs5QrUeEUJaaym2TSLG7gaL8d9RFonDk5Nd63o8a6l0F1UZfuTTdWE50hviMLNi1os2o9JXfI28hHmYzoqjjh8vqNRaWPskVj8Xv8OLnLdwQQ7buZ/FPOKHgy3lAI1ykN5VR4ycyX2tr/v/RnQOtaEGL7ladFLOF2Eog1zc6aIuCYdn4eZIibSGu61mlpI4zi7cnZD8Hgwta9R/UBH+hDsNBM6o9M0oruifXJ+V8hzDw3aV+gPsdVJuBicowOyGLcMr3Gy0BuPp6AQAA"
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage/CDKMetadata/Default"
@@ -789,17 +789,17 @@
     }
   },
   "Parameters": {
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
       "Type": "String"
     },
-    "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+    "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref": {
+    "amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef": {
       "Value": {
-        "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket56A4F200"
+        "Ref": "moodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket7FFBE5AD"
       }
     }
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
index 48b192d42a3..abd3069ffbf 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "webClientId",
-    "OutputValue": "6dkse6kuhg779dhl6glmefrmrq"
+    "OutputValue": "q6pv2fdcs4s7to7ocp8th73n4"
   },
   {
     "OutputKey": "socialProviders",
@@ -13,7 +13,7 @@
   },
   {
     "OutputKey": "bucketName",
-    "OutputValue": "amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z"
+    "OutputValue": "amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu"
   },
   {
     "OutputKey": "signupAttributes",
@@ -21,7 +21,7 @@
   },
   {
     "OutputKey": "oauthClientId",
-    "OutputValue": "6dkse6kuhg779dhl6glmefrmrq"
+    "OutputValue": "q6pv2fdcs4s7to7ocp8th73n4"
   },
   {
     "OutputKey": "allowUnauthenticatedIdentities",
@@ -77,11 +77,11 @@
   },
   {
     "OutputKey": "awsAppsyncApiEndpoint",
-    "OutputValue": "https://mpfp3754i5h4livlltnjpjrfla.appsync-api.us-east-1.amazonaws.com/graphql"
+    "OutputValue": "https://nbzf77kjhrhd7filvpc2wcgi3a.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
     "OutputKey": "awsAppsyncApiId",
-    "OutputValue": "lni7x3hwoncrhp3t6pnlk4wxtm"
+    "OutputValue": "p7wg7nhku5eq5bx6kble2s2x7q"
   },
   {
     "OutputKey": "authRegion",
@@ -89,11 +89,11 @@
   },
   {
     "OutputKey": "buckets",
-    "OutputValue": "[\"{\\\"name\\\":\\\"moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x\\\",\\\"bucketName\\\":\\\"amplify-moodboard26041519-moodboard20e29595008142e-qpktfs41rj1z\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"guest\\\":[\\\"get\\\",\\\"list\\\"],\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
+    "OutputValue": "[\"{\\\"name\\\":\\\"moodboard20e29595008142e3ad16f01c4066e1c4x-gen2-x\\\",\\\"bucketName\\\":\\\"amplify-moodboard26042215-moodboard20e29595008142e-k65tfahquevu\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"guest\\\":[\\\"get\\\",\\\"list\\\"],\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
   },
   {
     "OutputKey": "amplifyApiModelSchemaS3Uri",
-    "OutputValue": "s3://amplify-moodboard26041519-amplifydataamplifycodege-ytkavmopvf6i/model-schema.graphql"
+    "OutputValue": "s3://amplify-moodboard26042215-amplifydataamplifycodege-1xk29fatbprq/model-schema.graphql"
   },
   {
     "OutputKey": "groups",
@@ -125,11 +125,11 @@
   },
   {
     "OutputKey": "userPoolId",
-    "OutputValue": "us-east-1_5iU0nP22B"
+    "OutputValue": "us-east-1_S5zs48BQ8"
   },
   {
     "OutputKey": "identityPoolId",
-    "OutputValue": "us-east-1:3a5eeecb-0ea0-4cbe-93f4-2094213caf65"
+    "OutputValue": "us-east-1:fd95d154-e9d4-426b-b587-e4c8b3c72426"
   },
   {
     "OutputKey": "verificationMechanisms",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.template.json
index 312e1ab0669..d059ea93ff8 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-e2e-sandbox-x.template.json
@@ -74,7 +74,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref"
         ]
       }
     },
@@ -82,7 +82,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef"
         ]
       }
     },
@@ -90,7 +90,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
         ]
       }
     },
@@ -148,7 +148,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPoolAppClient54FF5C73Ref"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPoolAppClient9141812BRef"
         ]
       }
     },
@@ -159,7 +159,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
         ]
       }
     },
@@ -167,7 +167,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl"
         ]
       }
     },
@@ -200,7 +200,7 @@
                             {
                               "Fn::GetAtt": [
                                 "data7552DF31",
-                                "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB1CECC87FDestinationBucketArn"
+                                "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB6C2E9844DestinationBucketArn"
                               ]
                             }
                           ]
@@ -220,7 +220,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey"
         ]
       }
     },
@@ -236,21 +236,21 @@
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifymoodboarde2esandbox685dc54d14functionmoodboardGetRandomEmojigen2xlambda9EA3D3D3Ref"
+                "Outputs.amplifymoodboarde2esandbox4f6bc84565functionmoodboardGetRandomEmojigen2xlambdaDCDC903DRef"
               ]
             },
             "\",\"",
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisReadergen2xlambda2566B4CDRef"
+                "Outputs.amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisReadergen2xlambdaF592F734Ref"
               ]
             },
             "\",\"",
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifymoodboarde2esandbox685dc54d14functionmoodboardKinesisTriggergen2xlambda7EBA9517Ref"
+                "Outputs.amplifymoodboarde2esandbox4f6bc84565functionmoodboardKinesisTriggergen2xlambda99911AACRef"
               ]
             },
             "\"]"
@@ -267,7 +267,7 @@
       "Value": {
         "Fn::GetAtt": [
           "storage0EC3F24A",
-          "Outputs.amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref"
+          "Outputs.amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef"
         ]
       }
     },
@@ -280,7 +280,7 @@
             {
               "Fn::GetAtt": [
                 "storage0EC3F24A",
-                "Outputs.amplifymoodboarde2esandbox685dc54d14storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket41195188Ref"
+                "Outputs.amplifymoodboarde2esandbox4f6bc84565storagemoodboard20e29595008142e3ad16f01c4066e1c4xgen2xBucket80FFAB3CRef"
               ]
             },
             "\\\",\\\"storageRegion\\\":\\\"",
@@ -323,7 +323,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/937ee10ac54e7ed8595116254f443cc7866de690226ea21a4f01756b83d6237d.json"
+              "/4c11b3d0e28db45c86a64c60b1eba469738d5ecc8c8be11be1e87b6e2c07b510.json"
             ]
           ]
         }
@@ -332,7 +332,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/auth.NestedStack/auth.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14auth8134E757.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565auth107F5210.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -340,28 +340,28 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthUserPool390B0381Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthUserPool88309446Ref"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthIdentityPoolA541B351Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthIdentityPoolB9F41888Ref"
             ]
           }
         },
@@ -391,7 +391,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/5ba56677fbdb648c1c4e2ff08d6e3696d8defb8784643745b569cb54e581ba88.json"
+              "/4616e280f84d2fe8a6266d4f70be88617cb5051590ceb07956ab0e54f5286a2a.json"
             ]
           ]
         }
@@ -400,7 +400,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/data.NestedStack/data.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14data724E8EBD.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565data95DC4A09.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -408,16 +408,16 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
             ]
           }
         },
@@ -447,7 +447,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/339a3d2e39878323914e35e0b41cde22ee43f74dfa163c8c6ad802dc0180619b.json"
+              "/0503415f234fe5f271389e4ede31d3f73492ee73c235adc0b35b89503ff170f7.json"
             ]
           ]
         }
@@ -456,7 +456,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/storage.NestedStack/storage.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14storageFEFDB750.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565storageDFFECA2B.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -464,28 +464,28 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14analyticsNestedStackanalyticsNestedStackResource450FEA80Outputsamplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565analyticsNestedStackanalyticsNestedStackResource039716A4Outputsamplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn": {
             "Fn::GetAtt": [
               "analytics5794DE4A",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14analyticsmoodboardKinesisKinesisStream0B86977BArn"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565analyticsmoodboardKinesisKinesisStreamE12E9220Arn"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791ApiId"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1ApiId"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPIDefaultApiKeyB2AB63AEApiKey"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIDefaultApiKey26B68483ApiKey"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14dataNestedStackdataNestedStackResourceDB3F3A95Outputsamplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565dataNestedStackdataNestedStackResource55AEE991Outputsamplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14dataamplifyDataGraphQLAPI0EC27791GraphQLUrl"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565dataamplifyDataGraphQLAPIAA6EB5D1GraphQLUrl"
             ]
           }
         },
@@ -515,7 +515,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/6c67613a8413976d59ee10eb6f87180b2c4a71384ea521063553fcb3a6624067.json"
+              "/d715d2ecf941b418b307513db1c918256951bfb807fff6e0aa39d3d1afb98bac.json"
             ]
           ]
         }
@@ -524,7 +524,7 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/function.NestedStack/function.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14functionC9E3F1B4.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565functionAC3C5D1F.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -532,16 +532,16 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthauthenticatedUserRoleECA75B03Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthauthenticatedUserRole9FBEFADDRef"
             ]
           },
-          "referencetoamplifymoodboarde2esandbox685dc54d14authNestedStackauthNestedStackResourceAFCFFB8EOutputsamplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref": {
+          "referencetoamplifymoodboarde2esandbox4f6bc84565authNestedStackauthNestedStackResource564C9872Outputsamplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifymoodboarde2esandbox685dc54d14authamplifyAuthunauthenticatedUserRole92D42D98Ref"
+              "Outputs.amplifymoodboarde2esandbox4f6bc84565authamplifyAuthunauthenticatedUserRole2ADAA45CRef"
             ]
           }
         },
@@ -571,7 +571,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/8803dc63a3d43f46c60581f176abc77737851589c595d2acbff103c40d9104fd.json"
+              "/f51883e98a734dcdfe8d79cb3c50105df6d907cb71a736f967cd766e6415d207.json"
             ]
           ]
         }
@@ -580,14 +580,14 @@
       "DeletionPolicy": "Delete",
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/analytics.NestedStack/analytics.NestedStackResource",
-        "aws:asset:path": "amplifymoodboarde2esandbox685dc54d14analyticsFB47A380.nested.template.json",
+        "aws:asset:path": "amplifymoodboarde2esandbox4f6bc84565analytics5F246875.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zPSMzI10DNQTCwv1k1OydbNyUzSqw4uSUzO1nFOy/MvLSkoLQGxwEK1Onn5Kal6WcX6ZUZGekaGegaKWcWZmbpFpXklmbmpekEQGgAi+73KVAAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zPSMzI10DNQTCwv1k1OydbNyUzSqw4uSUzO1nFOy/MvLSkoLQGxwEK1Onn5Kal6WcX6ZUYmeoamegaKWcWZmbpFpXklmbmpekEQGgDpjg8qVAAAAA=="
       },
       "Metadata": {
         "aws:cdk:path": "amplify-moodboard-e2e-sandbox-x/CDKMetadata/Default"
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.outputs.json
index db4683f2708..27860e5f183 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.outputs.json
@@ -1,15 +1,15 @@
 [
   {
     "OutputKey": "GetAttBoardTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:58:24.521",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Board-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:02:22.083",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:BoardTable:StreamArn"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:BoardTable:StreamArn"
   },
   {
     "OutputKey": "GetAttBoardDataSourceName",
     "OutputValue": "BoardTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:BoardDataSource:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:BoardDataSource:Name"
   },
   {
     "OutputKey": "transformerrootstackBoardBoardDataSource99BFC69FName",
@@ -17,12 +17,12 @@
   },
   {
     "OutputKey": "GetAttBoardTableName",
-    "OutputValue": "Board-g26hrobfy5b5pniveska5ylg4u-x",
+    "OutputValue": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:BoardTable:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:BoardTable:Name"
   },
   {
     "OutputKey": "transformerrootstackBoardBoardTable30788E07Ref",
-    "OutputValue": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+    "OutputValue": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.parameters.json
index 93bc00745df..dd7b44f167f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.parameters.json
@@ -5,15 +5,19 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemSubscriptiononCreateMoodItemauth0FunctionSubscriptiononCreateMoodItemauth0FunctionAppSyncFunction643A2F06FunctionId",
-    "ParameterValue": "44lyones3nbsje6xsdylciyoea"
+    "ParameterValue": "gfqmk72sjfbebpfvrcljhgsm3e"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId",
-    "ParameterValue": "76d7mcfjujcszn2bao5ud4r34y"
+    "ParameterValue": "tk6wfeig2rcqxfwqrn2h7i55yu"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
+    "ParameterValue": "NONE_DS"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +25,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItemauth0FunctionQuerygetMoodItemauth0FunctionAppSyncFunctionBB402264FunctionId",
-    "ParameterValue": "6cvppxjcw5dmpkd7qvbxind4hq"
+    "ParameterValue": "jghpvnk5zrhafme37hmu2saaja"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationupdateMoodIteminit0FunctionMutationupdateMoodIteminit0FunctionAppSyncFunctionA5BB53A1FunctionId",
-    "ParameterValue": "payn2i2knvfyljovv2mixvi75e"
+    "ParameterValue": "docooofo6fe3flqjkbjng7w45y"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -41,11 +45,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId",
-    "ParameterValue": "qu72vtxaijcprnjn6dtfq7nwjq"
+    "ParameterValue": "fzzlagmc3vanffutm32ey6itrm"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemSubscriptionOnCreateMoodItemDataResolverFnSubscriptionOnCreateMoodItemDataResolverFnAppSyncFunctionE0588344FunctionId",
-    "ParameterValue": "rcieoro7irf2thbr2k73dhvi4a"
+    "ParameterValue": "xy7jh3sarrbefk7affnwizxafu"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,7 +61,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId",
-    "ParameterValue": "7gcwmfyxjfc2hfsg4wv6g74ibe"
+    "ParameterValue": "uwwlonwxizglxgjr7vocoar6mi"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.template.json
index a5424ee4beb..15b0619988e 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-Board-x.template.json
@@ -55,6 +55,9 @@
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId": {
       "Type": "String"
     },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    },
     "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
       "Type": "String"
     },
@@ -455,7 +458,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +553,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -558,6 +561,66 @@
         "TypeName": "Query"
       }
     },
+    "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardinit1Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.init.2.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateBoardfinish0Function",
+        "RequestMappingTemplate": "$util.toJson({})",
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createBoard.finish.1.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
     "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
@@ -622,6 +685,12 @@
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId"
             },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardinit1FunctionMutationcreateBoardinit1FunctionAppSyncFunction226CF18A",
+                "FunctionId"
+              ]
+            },
             {
               "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId"
             },
@@ -633,6 +702,12 @@
                 "MutationCreateBoardDataResolverFnMutationCreateBoardDataResolverFnAppSyncFunctionA8197CF5",
                 "FunctionId"
               ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateBoardfinish0FunctionMutationcreateBoardfinish0FunctionAppSyncFunctionF7EE67D3",
+                "FunctionId"
+              ]
             }
           ]
         },
@@ -648,7 +723,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +875,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +1024,7 @@
               {
                 "Ref": "BoardTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +1061,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1098,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1135,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.parameters.json
index 5952b69116f..4b83d0798a4 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.parameters.json
@@ -1,7 +1,7 @@
 [
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "referencetotransformerrootstackBoardNestedStackBoardNestedStackResource9E449E87OutputstransformerrootstackBoardBoardDataSource99BFC69FName",
@@ -13,15 +13,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "referencetotransformerrootstackBoardNestedStackBoardNestedStackResource9E449E87OutputstransformerrootstackBoardBoardTable30788E07Ref",
-    "ParameterValue": "Board-g26hrobfy5b5pniveska5ylg4u-x"
+    "ParameterValue": "Board-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMoodItemTable5135EED9Ref",
-    "ParameterValue": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+    "ParameterValue": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.template.json
index e7de9446f4d..e8a18be281f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-ConnectionStack-x.template.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMoodItemTable5135EED9Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackBoardNestedStackBoardNestedStackResource9E449E87OutputstransformerrootstackBoardBoardTable30788E07Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-CustomResourcesjson-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-CustomResourcesjson-x.parameters.json
index 90e52b6bdcc..873665d1726 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-CustomResourcesjson-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-CustomResourcesjson-x.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "AppSyncApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "env",
@@ -13,7 +13,7 @@
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "AppSyncApiName",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-FunctionDirectiveStack-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-FunctionDirectiveStack-x.parameters.json
index c49aa8118dc..60d455602a9 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-FunctionDirectiveStack-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-FunctionDirectiveStack-x.parameters.json
@@ -1,7 +1,7 @@
 [
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.outputs.json
index 7bb1715982f..687009c8238 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.outputs.json
@@ -1,20 +1,20 @@
 [
   {
     "OutputKey": "GetAttKinesisEventCountTableName",
-    "OutputValue": "KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x",
+    "OutputValue": "KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:KinesisEventCountTable:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:KinesisEventCountTable:Name"
   },
   {
     "OutputKey": "GetAttKinesisEventCountTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/KinesisEventCount-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:58:24.751",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/KinesisEventCount-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:02:22.180",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:KinesisEventCountTable:StreamArn"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:KinesisEventCountTable:StreamArn"
   },
   {
     "OutputKey": "GetAttKinesisEventCountDataSourceName",
     "OutputValue": "KinesisEventCountTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:KinesisEventCountDataSource:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:KinesisEventCountDataSource:Name"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.parameters.json
index 93bc00745df..092a960b5eb 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.parameters.json
@@ -5,15 +5,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemSubscriptiononCreateMoodItemauth0FunctionSubscriptiononCreateMoodItemauth0FunctionAppSyncFunction643A2F06FunctionId",
-    "ParameterValue": "44lyones3nbsje6xsdylciyoea"
+    "ParameterValue": "gfqmk72sjfbebpfvrcljhgsm3e"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId",
-    "ParameterValue": "76d7mcfjujcszn2bao5ud4r34y"
+    "ParameterValue": "tk6wfeig2rcqxfwqrn2h7i55yu"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +21,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemQuerygetMoodItemauth0FunctionQuerygetMoodItemauth0FunctionAppSyncFunctionBB402264FunctionId",
-    "ParameterValue": "6cvppxjcw5dmpkd7qvbxind4hq"
+    "ParameterValue": "jghpvnk5zrhafme37hmu2saaja"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationupdateMoodIteminit0FunctionMutationupdateMoodIteminit0FunctionAppSyncFunctionA5BB53A1FunctionId",
-    "ParameterValue": "payn2i2knvfyljovv2mixvi75e"
+    "ParameterValue": "docooofo6fe3flqjkbjng7w45y"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -41,11 +41,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId",
-    "ParameterValue": "qu72vtxaijcprnjn6dtfq7nwjq"
+    "ParameterValue": "fzzlagmc3vanffutm32ey6itrm"
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemSubscriptionOnCreateMoodItemDataResolverFnSubscriptionOnCreateMoodItemDataResolverFnAppSyncFunctionE0588344FunctionId",
-    "ParameterValue": "rcieoro7irf2thbr2k73dhvi4a"
+    "ParameterValue": "xy7jh3sarrbefk7affnwizxafu"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,7 +57,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId",
-    "ParameterValue": "7gcwmfyxjfc2hfsg4wv6g74ibe"
+    "ParameterValue": "uwwlonwxizglxgjr7vocoar6mi"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.template.json
index 0579ddf240e..713b74865aa 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-KinesisEventCount-x.template.json
@@ -455,7 +455,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -550,7 +550,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -648,7 +648,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -800,7 +800,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -949,7 +949,7 @@
               {
                 "Ref": "KinesisEventCountTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -986,7 +986,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1023,7 +1023,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1060,7 +1060,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.outputs.json
index 92c8d00c7db..ab57336b12a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.outputs.json
@@ -1,27 +1,27 @@
 [
   {
     "OutputKey": "GetAttMoodItemTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-g26hrobfy5b5pniveska5ylg4u-x/stream/2026-04-15T23:57:22.278",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x/stream/2026-04-22T20:01:20.197",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:MoodItemTable:StreamArn"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:MoodItemTable:StreamArn"
   },
   {
     "OutputKey": "GetAttMoodItemDataSourceName",
     "OutputValue": "MoodItemTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:MoodItemDataSource:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:MoodItemDataSource:Name"
   },
   {
     "OutputKey": "transformerrootstackMoodItemMoodItemTable5135EED9Ref",
-    "OutputValue": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x"
+    "OutputValue": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x"
   },
   {
     "OutputKey": "transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId",
-    "OutputValue": "76d7mcfjujcszn2bao5ud4r34y"
+    "OutputValue": "tk6wfeig2rcqxfwqrn2h7i55yu"
   },
   {
     "OutputKey": "transformerrootstackMoodItemSubscriptionOnCreateMoodItemDataResolverFnSubscriptionOnCreateMoodItemDataResolverFnAppSyncFunctionE0588344FunctionId",
-    "OutputValue": "rcieoro7irf2thbr2k73dhvi4a"
+    "OutputValue": "xy7jh3sarrbefk7affnwizxafu"
   },
   {
     "OutputKey": "transformerrootstackMoodItemMoodItemDataSource0777FF0CName",
@@ -29,28 +29,28 @@
   },
   {
     "OutputKey": "transformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId",
-    "OutputValue": "7gcwmfyxjfc2hfsg4wv6g74ibe"
+    "OutputValue": "uwwlonwxizglxgjr7vocoar6mi"
   },
   {
     "OutputKey": "transformerrootstackMoodItemMutationupdateMoodIteminit0FunctionMutationupdateMoodIteminit0FunctionAppSyncFunctionA5BB53A1FunctionId",
-    "OutputValue": "payn2i2knvfyljovv2mixvi75e"
+    "OutputValue": "docooofo6fe3flqjkbjng7w45y"
   },
   {
     "OutputKey": "transformerrootstackMoodItemQuerygetMoodItemauth0FunctionQuerygetMoodItemauth0FunctionAppSyncFunctionBB402264FunctionId",
-    "OutputValue": "6cvppxjcw5dmpkd7qvbxind4hq"
+    "OutputValue": "jghpvnk5zrhafme37hmu2saaja"
   },
   {
     "OutputKey": "transformerrootstackMoodItemMutationcreateMoodItemauth0FunctionMutationcreateMoodItemauth0FunctionAppSyncFunction8743A884FunctionId",
-    "OutputValue": "qu72vtxaijcprnjn6dtfq7nwjq"
+    "OutputValue": "fzzlagmc3vanffutm32ey6itrm"
   },
   {
     "OutputKey": "GetAttMoodItemTableName",
-    "OutputValue": "MoodItem-g26hrobfy5b5pniveska5ylg4u-x",
+    "OutputValue": "MoodItem-xn3j437hmbcnfl2xxwcnmqujpy-x",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "g26hrobfy5b5pniveska5ylg4u:GetAtt:MoodItemTable:Name"
+    "ExportName": "xn3j437hmbcnfl2xxwcnmqujpy:GetAtt:MoodItemTable:Name"
   },
   {
     "OutputKey": "transformerrootstackMoodItemSubscriptiononCreateMoodItemauth0FunctionSubscriptiononCreateMoodItemauth0FunctionAppSyncFunction643A2F06FunctionId",
-    "OutputValue": "44lyones3nbsje6xsdylciyoea"
+    "OutputValue": "gfqmk72sjfbebpfvrcljhgsm3e"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.parameters.json
index 98233020ced..51bab46a6e4 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -25,7 +25,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.template.json
index 5f43bcbd7eb..80cf6793707 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x-MoodItem-x.template.json
@@ -548,7 +548,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -649,7 +649,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -816,7 +816,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1004,7 +1004,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1156,7 +1156,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1277,7 +1277,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1323,7 +1323,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1369,7 +1369,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1470,7 +1470,7 @@
               {
                 "Ref": "MoodItemTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:3d8fd33e-401a-4ed4-acad-8c792e374c7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:89caf13a-ffcc-49eb-bec0-4c7280fab34b\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"moodboardKinesisTrigger-x\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.outputs.json
index 0c110d2140a..3605f0764c3 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.outputs.json
@@ -1,13 +1,13 @@
 [
   {
     "OutputKey": "GraphQLAPIIdOutput",
-    "OutputValue": "g26hrobfy5b5pniveska5ylg4u",
+    "OutputValue": "xn3j437hmbcnfl2xxwcnmqujpy",
     "Description": "Your GraphQL API ID.",
     "ExportName": "amplify-moodboard-x-x-apimoodboard-x:GraphQLApiId"
   },
   {
     "OutputKey": "GraphQLAPIEndpointOutput",
-    "OutputValue": "https://e4tubez5fjbb3nezriwdcqaade.appsync-api.us-east-1.amazonaws.com/graphql",
+    "OutputValue": "https://c2wqjlgc55b7rht2i2ism5l2dq.appsync-api.us-east-1.amazonaws.com/graphql",
     "Description": "Your GraphQL API endpoint.",
     "ExportName": "amplify-moodboard-x-x-apimoodboard-x:GraphQLApiEndpoint"
   },
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.parameters.json
index bff059533d1..fb201b83b24 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.parameters.json
@@ -29,7 +29,7 @@
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
-    "ParameterValue": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441"
+    "ParameterValue": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812"
   },
   {
     "ParameterKey": "AppSyncApiName",
@@ -37,6 +37,6 @@
   },
   {
     "ParameterKey": "AuthCognitoUserPoolId",
-    "ParameterValue": "us-east-1_uFCFZxzU8"
+    "ParameterValue": "us-east-1_s6JCk9b66"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.template.json
index 71f1788528b..e04e7f8159a 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-apimoodboard-x.template.json
@@ -128,7 +128,7 @@
           ]
         },
         "Description": "moodBoard API Key",
-        "Expires": 1807833377
+        "Expires": 1808424014
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -260,6 +260,12 @@
               "Outputs.transformerrootstackMoodItemQuerygetMoodItempostAuth0FunctionQuerygetMoodItempostAuth0FunctionAppSyncFunctionA2A15C1FFunctionId"
             ]
           },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
           "referencetotransformerrootstackMoodItemNestedStackMoodItemNestedStackResource1C28E2A1OutputstransformerrootstackMoodItemMutationcreateMoodIteminit0FunctionMutationcreateMoodIteminit0FunctionAppSyncFunctionA7648B0CFunctionId": {
             "Fn::GetAtt": [
               "MoodItem",
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-authmoodboard759ae00a-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-authmoodboard759ae00a-x.outputs.json
index b1431988edd..2167435ce4f 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-authmoodboard759ae00a-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-authmoodboard759ae00a-x.outputs.json
@@ -1,27 +1,27 @@
 [
   {
     "OutputKey": "UserPoolId",
-    "OutputValue": "us-east-1_uFCFZxzU8",
+    "OutputValue": "us-east-1_s6JCk9b66",
     "Description": "Id for the user pool"
   },
   {
     "OutputKey": "AppClientIDWeb",
-    "OutputValue": "74tvl72po139f1o6bp04rcs7s",
+    "OutputValue": "7d0ivgc5sn4orr5fq46rfep64t",
     "Description": "The user pool app client id for web"
   },
   {
     "OutputKey": "AppClientID",
-    "OutputValue": "4jbh65m4dc0ipi3j8918a7d372",
+    "OutputValue": "137ba15dh8fv20rcesjb7ocvhq",
     "Description": "The user pool app client id"
   },
   {
     "OutputKey": "IdentityPoolId",
-    "OutputValue": "us-east-1:6de0aef6-4b5a-4180-8f08-43c49990b843",
+    "OutputValue": "us-east-1:15aa1df2-4f28-4773-85b9-90f17f809a12",
     "Description": "Id for the identity pool"
   },
   {
     "OutputKey": "UserPoolArn",
-    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_uFCFZxzU8",
+    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_s6JCk9b66",
     "Description": "Arn for the user pool"
   },
   {
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-functionmoodboardKinesisTrigger-x.parameters.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-functionmoodboardKinesisTrigger-x.parameters.json
index 9ac2aaa3856..67646cd7adc 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-functionmoodboardKinesisTrigger-x.parameters.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x-functionmoodboardKinesisTrigger-x.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "s3Key",
-    "ParameterValue": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip"
+    "ParameterValue": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip"
   },
   {
     "ParameterKey": "analyticsmoodboardKinesiskinesisStreamArn",
@@ -17,7 +17,7 @@
   },
   {
     "ParameterKey": "apimoodboardGraphQLAPIIdOutput",
-    "ParameterValue": "g26hrobfy5b5pniveska5ylg4u"
+    "ParameterValue": "xn3j437hmbcnfl2xxwcnmqujpy"
   },
   {
     "ParameterKey": "deploymentBucketName",
@@ -29,6 +29,6 @@
   },
   {
     "ParameterKey": "apimoodboardGraphQLAPIEndpointOutput",
-    "ParameterValue": "https://e4tubez5fjbb3nezriwdcqaade.appsync-api.us-east-1.amazonaws.com/graphql"
+    "ParameterValue": "https://c2wqjlgc55b7rht2i2ism5l2dq.appsync-api.us-east-1.amazonaws.com/graphql"
   }
 ]
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.outputs.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.outputs.json
index 475a350b0de..404f6367a02 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.outputs.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.outputs.json
@@ -35,7 +35,7 @@
   },
   {
     "OutputKey": "StackId",
-    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/89310e30-3926-11f1-aaf3-0afff4ed678f",
+    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-moodboard-x-x/9f24d640-3e85-11f1-962e-0affccb07fed",
     "Description": "CloudFormation provider root stack name",
     "ExportName": "amplify-moodboard-x-x-StackId"
   }
diff --git a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.template.json b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.template.json
index 182fae93e41..d5cfca0a2ca 100644
--- a/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.template.json
+++ b/amplify-migration-apps/mood-board/_snapshot.pre.refactor/amplify-moodboard-x-x.template.json
@@ -268,7 +268,7 @@
             ]
           },
           "S3DeploymentBucket": "amplify-moodboard-x-x-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/43e6fad4f7ae7e9b21954a41da4290129df61441",
+          "S3DeploymentRootKey": "amplify-appsync-files/6be25d562dedde17a5c319fedda0266e5649b812",
           "env": "x"
         }
       }
@@ -340,7 +340,7 @@
         "TemplateURL": "https://s3.amazonaws.com/amplify-moodboard-x-x-deployment/amplify-cfn-templates/function/moodboardKinesisTrigger-cloudformation-template.json",
         "Parameters": {
           "deploymentBucketName": "amplify-moodboard-x-x-deployment",
-          "s3Key": "amplify-builds/moodboardKinesisTrigger-5a615250796c76626f49-build.zip",
+          "s3Key": "amplify-builds/moodboardKinesisTrigger-327a374a39456c64746b-build.zip",
           "analyticsmoodboardKinesiskinesisStreamArn": {
             "Fn::GetAtt": [
               "analyticsmoodboardKinesis",
diff --git a/amplify-migration-apps/mood-board/tests/api.test.ts b/amplify-migration-apps/mood-board/tests/api.test.ts
index f749d824222..9a6a58f5397 100644
--- a/amplify-migration-apps/mood-board/tests/api.test.ts
+++ b/amplify-migration-apps/mood-board/tests/api.test.ts
@@ -39,7 +39,8 @@ describe('guest', () => {
 
       expect(typeof board.id).toBe('string');
       expect(board.id.length).toBeGreaterThan(0);
-      expect(board.name).toBe(name);
+      // The finish.1.res.vtl appends " (new!)" to the board name in the response.
+      expect(board.name).toBe(`${name} (new!)`);
       expect(board.createdAt).toBeDefined();
       expect(board.updatedAt).toBeDefined();
     });
@@ -107,7 +108,9 @@ describe('guest', () => {
       expect(items.length).toBeGreaterThanOrEqual(1);
       const found = items.find((b: any) => b.id === created.id);
       expect(found).toBeDefined();
-      expect(found.name).toBe(name);
+      // The Query.listBoards.res.vtl override prepends "📌 " to board names.
+      expect(found.name).toMatch(/^📌 /);
+      expect(found.name).toContain(name);
     });
   });
 
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.generator.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.generator.test.ts
index 09250a894e0..e13c3641c0a 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.generator.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.generator.test.ts
@@ -1,5 +1,13 @@
 import ts from 'typescript';
 import { DataGenerator } from '../../../../../../commands/gen2-migration/generate/amplify/data/data.generator';
+import {
+  parseExtendedResolverFilename,
+  classifyResolverFiles,
+  groupExtendedResolvers,
+  computeSpliceIndexes,
+  VALID_SLOTS,
+  getSlotBaseIndex,
+} from '../../../../../../commands/gen2-migration/generate/amplify/data/data.generator';
 import { BackendGenerator } from '../../../../../../commands/gen2-migration/generate/amplify/backend.generator';
 import { Gen1App } from '../../../../../../commands/gen2-migration/generate/_infra/gen1-app';
 import { DataRenderer, RenderDefineDataOptions } from '../../../../../../commands/gen2-migration/generate/amplify/data/data.renderer';
@@ -7,8 +15,16 @@ import { DataRenderer, RenderDefineDataOptions } from '../../../../../../command
 jest.unmock('fs-extra');
 
 const mockRender = jest.fn().mockReturnValue(ts.factory.createNodeArray([]));
+const mockRenderNoneDataSource = jest.fn().mockReturnValue(ts.factory.createEmptyStatement());
+const mockRenderAppsyncFunction = jest.fn().mockReturnValue(ts.factory.createEmptyStatement());
+const mockRenderSpliceStatements = jest.fn().mockReturnValue([ts.factory.createEmptyStatement()]);
 jest.mock('../../../../../../commands/gen2-migration/generate/amplify/data/data.renderer', () => ({
-  DataRenderer: jest.fn().mockImplementation(() => ({ render: mockRender })),
+  DataRenderer: jest.fn().mockImplementation(() => ({
+    render: mockRender,
+    renderNoneDataSource: mockRenderNoneDataSource,
+    renderAppsyncFunction: mockRenderAppsyncFunction,
+    renderSpliceStatements: mockRenderSpliceStatements,
+  })),
 }));
 
 const mockPrintNodes = jest.fn().mockReturnValue('/* generated */');
@@ -24,9 +40,18 @@ jest.mock('../../../../../../commands/gen2-migration/generate/_infra/ts', () =>
 
 const mockMkdir = jest.fn().mockResolvedValue(undefined);
 const mockWriteFile = jest.fn().mockResolvedValue(undefined);
+const mockCopyFile = jest.fn().mockResolvedValue(undefined);
 jest.mock('node:fs/promises', () => ({
   mkdir: (...args: unknown[]) => mockMkdir(...args),
   writeFile: (...args: unknown[]) => mockWriteFile(...args),
+  copyFile: (...args: unknown[]) => mockCopyFile(...args),
+}));
+
+const mockExistsSync = jest.fn().mockReturnValue(false);
+const mockReaddirSync = jest.fn().mockReturnValue([]);
+jest.mock('node:fs', () => ({
+  existsSync: (...args: unknown[]) => mockExistsSync(...args),
+  readdirSync: (...args: unknown[]) => mockReaddirSync(...args),
 }));
 
 function createMockGen1App(overrides?: Record<string, unknown>): Gen1App {
@@ -324,5 +349,441 @@ describe('DataGenerator', () => {
 
       expect(addStatementSpy).not.toHaveBeenCalled();
     });
+
+    describe('resolver overrides', () => {
+      it('does not add resolver operations when no resolvers directory exists', async () => {
+        mockExistsSync.mockReturnValue(false);
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+
+        expect(ops).toHaveLength(1);
+        const addStatementSpy = jest.spyOn(backendGenerator, 'addStatement');
+        await ops[0].execute();
+        expect(addStatementSpy).not.toHaveBeenCalled();
+      });
+
+      it('does not add resolver operations when resolvers directory has no vtl files', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['readme.txt', 'notes.md']);
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+
+        expect(ops).toHaveLength(1);
+      });
+
+      it('adds a copy operation when vtl files exist', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.res.vtl']);
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+
+        expect(ops).toHaveLength(2);
+        const descriptions = await ops[1].describe();
+        expect(descriptions[0]).toContain('1 VTL resolver file(s)');
+      });
+
+      it('copies vtl files to amplify/data/resolvers/', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.res.vtl', 'Mutation.createProduct.req.vtl']);
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+        await ops[1].execute();
+
+        expect(mockMkdir).toHaveBeenCalledWith(expect.stringContaining('resolvers'), { recursive: true });
+        expect(mockCopyFile).toHaveBeenCalledTimes(2);
+        expect(mockCopyFile).toHaveBeenCalledWith(
+          expect.stringContaining('Query.listProducts.res.vtl'),
+          expect.stringContaining('Query.listProducts.res.vtl'),
+        );
+        expect(mockCopyFile).toHaveBeenCalledWith(
+          expect.stringContaining('Mutation.createProduct.req.vtl'),
+          expect.stringContaining('Mutation.createProduct.req.vtl'),
+        );
+      });
+
+      it('contributes resolver override imports and statements to backendGenerator', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.res.vtl']);
+
+        const addImportSpy = jest.spyOn(backendGenerator, 'addImport');
+        const addNamespaceImportSpy = jest.spyOn(backendGenerator, 'addNamespaceImport');
+        const addStatementSpy = jest.spyOn(backendGenerator, 'addStatement');
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+        await ops[0].execute();
+
+        // Resolver imports: fs (readdirSync only), path, url
+        expect(addImportSpy).toHaveBeenCalledWith('fs', ['readdirSync']);
+        expect(addImportSpy).toHaveBeenCalledWith('path', ['join', 'dirname']);
+        expect(addImportSpy).toHaveBeenCalledWith('url', ['fileURLToPath']);
+        expect(addNamespaceImportSpy).toHaveBeenCalledWith('aws-cdk-lib/aws-s3-assets', 'assets');
+
+        // 4 statements: __dirname, resolversDir, resolverFiles, for-of loop
+        expect(addStatementSpy).toHaveBeenCalledTimes(4);
+      });
+
+      it('handles multiple vtl files of both req and res types', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.res.vtl', 'Query.listProducts.req.vtl', 'Mutation.createProduct.res.vtl']);
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+
+        expect(ops).toHaveLength(2);
+        const descriptions = await ops[1].describe();
+        expect(descriptions[0]).toContain('3 VTL resolver file(s)');
+      });
+
+      it('contributes extended resolver imports and statements when extended vtl files exist', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.postAuth.2.req.vtl']);
+
+        const addImportSpy = jest.spyOn(backendGenerator, 'addImport');
+        const addStatementSpy = jest.spyOn(backendGenerator, 'addStatement');
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+        await ops[0].execute();
+
+        expect(addImportSpy).toHaveBeenCalledWith('aws-cdk-lib', ['aws_appsync']);
+        expect(addImportSpy).toHaveBeenCalledWith('aws-cdk-lib/aws-appsync', ['CfnResolver']);
+
+        // Common declarations (2) + noneDataSource (1) + appsyncFunction (1) + splice statements (1)
+        expect(addStatementSpy).toHaveBeenCalled();
+        expect(mockRenderNoneDataSource).toHaveBeenCalledTimes(1);
+        expect(mockRenderAppsyncFunction).toHaveBeenCalledTimes(1);
+        expect(mockRenderSpliceStatements).toHaveBeenCalledTimes(1);
+      });
+
+      it('handles mixed override and extended resolver files', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.req.vtl', 'Query.listProducts.postAuth.2.req.vtl']);
+
+        const addImportSpy = jest.spyOn(backendGenerator, 'addImport');
+        const addStatementSpy = jest.spyOn(backendGenerator, 'addStatement');
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+        await ops[0].execute();
+
+        // Override imports
+        expect(addImportSpy).toHaveBeenCalledWith('fs', ['readdirSync']);
+        expect(addImportSpy).toHaveBeenCalledWith('url', ['fileURLToPath']);
+
+        // Extended resolver imports
+        expect(addImportSpy).toHaveBeenCalledWith('aws-cdk-lib', ['aws_appsync']);
+        expect(addImportSpy).toHaveBeenCalledWith('aws-cdk-lib/aws-appsync', ['CfnResolver']);
+
+        // Both override and extended statements contributed
+        expect(addStatementSpy).toHaveBeenCalled();
+        expect(mockRenderNoneDataSource).toHaveBeenCalledTimes(1);
+        expect(mockRenderAppsyncFunction).toHaveBeenCalledTimes(1);
+      });
+
+      it('does not add extended resolver imports when only override files exist', async () => {
+        mockExistsSync.mockReturnValue(true);
+        mockReaddirSync.mockReturnValue(['Query.listProducts.req.vtl']);
+
+        const addImportSpy = jest.spyOn(backendGenerator, 'addImport');
+
+        const generator = new DataGenerator(gen1App, backendGenerator, outputDir, {
+          category: 'api',
+          resourceName: 'testApi',
+          service: 'AppSync',
+          key: 'api:AppSync',
+        });
+        const ops = await generator.plan();
+        await ops[0].execute();
+
+        expect(addImportSpy).not.toHaveBeenCalledWith('aws-cdk-lib', ['aws_appsync']);
+        expect(addImportSpy).not.toHaveBeenCalledWith('aws-cdk-lib/aws-appsync', ['CfnResolver']);
+        expect(mockRenderNoneDataSource).not.toHaveBeenCalled();
+        expect(mockRenderAppsyncFunction).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
+
+describe('parseExtendedResolverFilename', () => {
+  it('parses a valid extended resolver filename with req template', () => {
+    const result = parseExtendedResolverFilename('Query.listProducts.postAuth.2.req.vtl');
+    expect(result).toEqual({
+      typeName: 'Query',
+      fieldName: 'listProducts',
+      slot: 'postAuth',
+      order: 2,
+      templateType: 'req',
+      filename: 'Query.listProducts.postAuth.2.req.vtl',
+    });
+  });
+
+  it('parses a valid extended resolver filename with res template', () => {
+    const result = parseExtendedResolverFilename('Mutation.createProduct.preUpdate.1.res.vtl');
+    expect(result).toEqual({
+      typeName: 'Mutation',
+      fieldName: 'createProduct',
+      slot: 'preUpdate',
+      order: 1,
+      templateType: 'res',
+      filename: 'Mutation.createProduct.preUpdate.1.res.vtl',
+    });
+  });
+
+  it('parses all valid slots for their respective operation types', () => {
+    const slotTypeMap: Record<string, string> = {
+      init: 'Query',
+      preAuth: 'Query',
+      auth: 'Query',
+      postAuth: 'Query',
+      preDataLoad: 'Query',
+      postDataLoad: 'Query',
+      preUpdate: 'Mutation',
+      postUpdate: 'Mutation',
+      preSubscribe: 'Subscription',
+      finish: 'Query',
+    };
+    for (const slot of VALID_SLOTS) {
+      const typeName = slotTypeMap[slot];
+      const filename = `${typeName}.someField.${slot}.1.req.vtl`;
+      const result = parseExtendedResolverFilename(filename);
+      expect(result.slot).toBe(slot);
+    }
+  });
+
+  it('throws for invalid slot', () => {
+    expect(() => parseExtendedResolverFilename('Query.listProducts.invalidSlot.1.req.vtl')).toThrow('invalidSlot');
+    expect(() => parseExtendedResolverFilename('Query.listProducts.invalidSlot.1.req.vtl')).toThrow(
+      'Query.listProducts.invalidSlot.1.req.vtl',
+    );
+  });
+
+  it('throws for non-numeric order', () => {
+    expect(() => parseExtendedResolverFilename('Query.listProducts.postAuth.abc.req.vtl')).toThrow('abc');
+    expect(() => parseExtendedResolverFilename('Query.listProducts.postAuth.abc.req.vtl')).toThrow(
+      'Query.listProducts.postAuth.abc.req.vtl',
+    );
+  });
+});
+
+describe('classifyResolverFiles', () => {
+  it('classifies override resolver files (4 segments)', () => {
+    const result = classifyResolverFiles(['Query.listProducts.req.vtl', 'Query.listProducts.res.vtl']);
+    expect(result.overrideFiles).toEqual(['Query.listProducts.req.vtl', 'Query.listProducts.res.vtl']);
+    expect(result.extendedDescriptors).toEqual([]);
+  });
+
+  it('classifies extended resolver files (6 segments)', () => {
+    const result = classifyResolverFiles(['Query.listProducts.postAuth.2.req.vtl']);
+    expect(result.overrideFiles).toEqual([]);
+    expect(result.extendedDescriptors).toHaveLength(1);
+    expect(result.extendedDescriptors[0].slot).toBe('postAuth');
+  });
+
+  it('classifies mixed override and extended files', () => {
+    const result = classifyResolverFiles(['Query.listProducts.req.vtl', 'Query.listProducts.postAuth.2.req.vtl']);
+    expect(result.overrideFiles).toHaveLength(1);
+    expect(result.extendedDescriptors).toHaveLength(1);
+  });
+
+  it('ignores files with unexpected segment counts', () => {
+    const result = classifyResolverFiles(['readme.txt', 'some.random.file.with.many.parts.vtl']);
+    expect(result.overrideFiles).toEqual([]);
+    expect(result.extendedDescriptors).toEqual([]);
+  });
+});
+
+describe('groupExtendedResolvers', () => {
+  it('groups descriptors by typeName and fieldName', () => {
+    const descriptors = [
+      parseExtendedResolverFilename('Query.listProducts.postAuth.1.req.vtl'),
+      parseExtendedResolverFilename('Query.getProduct.postAuth.1.req.vtl'),
+    ];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups).toHaveLength(2);
+  });
+
+  it('sorts functions within a group by slot pipeline order', () => {
+    const descriptors = [
+      parseExtendedResolverFilename('Query.listProducts.postDataLoad.1.req.vtl'),
+      parseExtendedResolverFilename('Query.listProducts.postAuth.1.req.vtl'),
+    ];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups).toHaveLength(1);
+    expect(groups[0].functions[0].slot).toBe('postAuth');
+    expect(groups[0].functions[1].slot).toBe('postDataLoad');
+  });
+
+  it('sorts functions within the same slot by numeric order', () => {
+    const descriptors = [
+      parseExtendedResolverFilename('Query.listProducts.postAuth.3.req.vtl'),
+      parseExtendedResolverFilename('Query.listProducts.postAuth.1.req.vtl'),
+    ];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups).toHaveLength(1);
+    expect(groups[0].functions[0].order).toBe(1);
+    expect(groups[0].functions[1].order).toBe(3);
+  });
+
+  it('pairs request and response templates for the same slot and order', () => {
+    const descriptors = [
+      parseExtendedResolverFilename('Query.listProducts.postAuth.1.req.vtl'),
+      parseExtendedResolverFilename('Query.listProducts.postAuth.1.res.vtl'),
+    ];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups).toHaveLength(1);
+    expect(groups[0].functions).toHaveLength(1);
+    expect(groups[0].functions[0].requestFile).toBe('Query.listProducts.postAuth.1.req.vtl');
+    expect(groups[0].functions[0].responseFile).toBe('Query.listProducts.postAuth.1.res.vtl');
+  });
+
+  it('leaves requestFile undefined when only response template exists', () => {
+    const descriptors = [parseExtendedResolverFilename('Query.listProducts.postAuth.1.res.vtl')];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups[0].functions[0].requestFile).toBeUndefined();
+    expect(groups[0].functions[0].responseFile).toBe('Query.listProducts.postAuth.1.res.vtl');
+  });
+
+  it('leaves responseFile undefined when only request template exists', () => {
+    const descriptors = [parseExtendedResolverFilename('Query.listProducts.postAuth.1.req.vtl')];
+    const groups = groupExtendedResolvers(descriptors);
+    expect(groups[0].functions[0].requestFile).toBe('Query.listProducts.postAuth.1.req.vtl');
+    expect(groups[0].functions[0].responseFile).toBeUndefined();
+  });
+});
+
+describe('computeSpliceIndexes', () => {
+  const queryBaseIndex = getSlotBaseIndex('Query', 'listProducts');
+
+  it('computes base index for a single function', () => {
+    const group = {
+      typeName: 'Query',
+      fieldName: 'listProducts',
+      functions: [
+        {
+          typeName: 'Query',
+          fieldName: 'listProducts',
+          slot: 'postAuth' as const,
+          order: 1,
+          requestFile: 'f.vtl',
+          responseFile: undefined,
+        },
+      ],
+    };
+    const result = computeSpliceIndexes(group);
+    expect(result).toHaveLength(1);
+    expect(result[0].spliceIndex).toBe(queryBaseIndex['postAuth']);
+  });
+
+  it('increments offset for multiple functions', () => {
+    const group = {
+      typeName: 'Query',
+      fieldName: 'listProducts',
+      functions: [
+        {
+          typeName: 'Query',
+          fieldName: 'listProducts',
+          slot: 'postAuth' as const,
+          order: 1,
+          requestFile: 'f.vtl',
+          responseFile: undefined,
+        },
+        {
+          typeName: 'Query',
+          fieldName: 'listProducts',
+          slot: 'postDataLoad' as const,
+          order: 1,
+          requestFile: 'g.vtl',
+          responseFile: undefined,
+        },
+      ],
+    };
+    const result = computeSpliceIndexes(group);
+    expect(result).toHaveLength(2);
+    expect(result[0].spliceIndex).toBe(queryBaseIndex['postAuth']);
+    expect(result[1].spliceIndex).toBe(queryBaseIndex['postDataLoad'] + 1);
+  });
+
+  it('handles multiple functions at the same slot', () => {
+    const group = {
+      typeName: 'Query',
+      fieldName: 'listProducts',
+      functions: [
+        {
+          typeName: 'Query',
+          fieldName: 'listProducts',
+          slot: 'postAuth' as const,
+          order: 1,
+          requestFile: 'f.vtl',
+          responseFile: undefined,
+        },
+        {
+          typeName: 'Query',
+          fieldName: 'listProducts',
+          slot: 'postAuth' as const,
+          order: 2,
+          requestFile: 'g.vtl',
+          responseFile: undefined,
+        },
+      ],
+    };
+    const result = computeSpliceIndexes(group);
+    expect(result).toHaveLength(2);
+    expect(result[0].spliceIndex).toBe(queryBaseIndex['postAuth']);
+    expect(result[1].spliceIndex).toBe(queryBaseIndex['postAuth'] + 1);
+  });
+
+  it('returns empty array for group with no functions', () => {
+    const group = {
+      typeName: 'Query',
+      fieldName: 'listProducts',
+      functions: [],
+    };
+    const result = computeSpliceIndexes(group);
+    expect(result).toEqual([]);
   });
 });
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.renderer.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.renderer.test.ts
index e4a0a575c69..77643e54a01 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.renderer.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.renderer.test.ts
@@ -300,4 +300,99 @@ describe('DataRenderer', () => {
       "
     `);
   });
+
+  describe('extended resolver rendering', () => {
+    it('renderNoneDataSource produces correct output', () => {
+      const node = renderer.renderNoneDataSource();
+      const output = TS.printNode(node);
+      expect(output).toMatchInlineSnapshot(`"const noneDataSource = backend.data.resources.graphqlApi.addNoneDataSource("none");"`);
+    });
+
+    it('renderAppsyncFunction with both templates', () => {
+      const node = renderer.renderAppsyncFunction({
+        typeName: 'Query',
+        fieldName: 'listProducts',
+        slot: 'postAuth',
+        order: 2,
+        requestFile: 'Query.listProducts.postAuth.2.req.vtl',
+        responseFile: 'Query.listProducts.postAuth.2.res.vtl',
+        spliceIndex: 2,
+      });
+      const output = TS.printNode(node);
+      expect(output).toMatchInlineSnapshot(`
+        "const QuerylistProductspostAuth2 = new aws_appsync.AppsyncFunction(backend.data.stack, "QuerylistProductspostAuth2", {
+            name: "QuerylistProductspostAuth2",
+            api: backend.data.resources.graphqlApi,
+            dataSource: noneDataSource,
+            requestMappingTemplate: aws_appsync.MappingTemplate.fromFile(join(resolversDir, "Query.listProducts.postAuth.2.req.vtl")),
+            responseMappingTemplate: aws_appsync.MappingTemplate.fromFile(join(resolversDir, "Query.listProducts.postAuth.2.res.vtl"))
+        });"
+      `);
+    });
+
+    it('renderAppsyncFunction with only request template', () => {
+      const node = renderer.renderAppsyncFunction({
+        typeName: 'Query',
+        fieldName: 'listProducts',
+        slot: 'postAuth',
+        order: 1,
+        requestFile: 'Query.listProducts.postAuth.1.req.vtl',
+        responseFile: undefined,
+        spliceIndex: 2,
+      });
+      const output = TS.printNode(node);
+      expect(output).toContain('MappingTemplate.fromFile(join(resolversDir, "Query.listProducts.postAuth.1.req.vtl"))');
+      expect(output).toContain('MappingTemplate.fromString("$util.toJson($ctx.prev.result)")');
+    });
+
+    it('renderAppsyncFunction with only response template', () => {
+      const node = renderer.renderAppsyncFunction({
+        typeName: 'Query',
+        fieldName: 'listProducts',
+        slot: 'postAuth',
+        order: 1,
+        requestFile: undefined,
+        responseFile: 'Query.listProducts.postAuth.1.res.vtl',
+        spliceIndex: 2,
+      });
+      const output = TS.printNode(node);
+      expect(output).toContain('MappingTemplate.fromString("$util.toJson({})")');
+      expect(output).toContain('MappingTemplate.fromFile(join(resolversDir, "Query.listProducts.postAuth.1.res.vtl"))');
+    });
+
+    it('renderSpliceStatements for single function', () => {
+      const statements = renderer.renderSpliceStatements('Query', 'listProducts', [
+        { constructName: 'QuerylistProductspostAuth2', spliceIndex: 2 },
+      ]);
+      const output = statements.map((s) => TS.printNode(s));
+
+      // Resolver access
+      expect(output[0]).toMatchInlineSnapshot(
+        `"const queryListProductsResolver = backend.data.resources.cfnResources.cfnResolvers["Query.listProducts"] as CfnResolver;"`,
+      );
+      // Pipeline functions extraction
+      expect(output[1]).toMatchInlineSnapshot(
+        `"const queryListProductsPipelineFunctions = (queryListProductsResolver.pipelineConfig as CfnResolver.PipelineConfigProperty).functions || [];"`,
+      );
+      // Splice call
+      expect(output[2]).toMatchInlineSnapshot(`"queryListProductsPipelineFunctions.splice(2, 0, QuerylistProductspostAuth2.functionId);"`);
+      // Pipeline config reassignment
+      expect(output[3]).toMatchInlineSnapshot(
+        `"queryListProductsResolver.pipelineConfig = { functions: queryListProductsPipelineFunctions };"`,
+      );
+    });
+
+    it('renderSpliceStatements for multiple functions', () => {
+      const statements = renderer.renderSpliceStatements('Query', 'listProducts', [
+        { constructName: 'QuerylistProductspostAuth1', spliceIndex: 2 },
+        { constructName: 'QuerylistProductspostDataLoad1', spliceIndex: 4 },
+      ]);
+      const output = statements.map((s) => TS.printNode(s));
+
+      // 2 (resolver + pipeline) + 2 (splice calls) + 1 (reassignment) = 5
+      expect(output).toHaveLength(5);
+      expect(output[2]).toContain('splice(2, 0, QuerylistProductspostAuth1.functionId)');
+      expect(output[3]).toContain('splice(4, 0, QuerylistProductspostDataLoad1.functionId)');
+    });
+  });
 });
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
index 82ba6de762f..a20028e9e0d 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
@@ -18,6 +18,7 @@ const factory = ts.factory;
  */
 export class BackendGenerator implements Planner {
   private readonly imports: Array<{ readonly source: string; readonly identifiers: string[] }> = [];
+  private readonly namespaceImports: Array<{ readonly source: string; readonly alias: string }> = [];
   private readonly defineBackendProperties: ts.ObjectLiteralElementLike[] = [];
   private readonly postDefineStatements: ts.Statement[] = [];
   private readonly earlyStatements: ts.Statement[] = [];
@@ -46,6 +47,15 @@ export class BackendGenerator implements Planner {
     }
   }
 
+  /**
+   * Adds a namespace import (`import * as alias from 'source'`) to backend.ts.
+   */
+  public addNamespaceImport(source: string, alias: string): void {
+    if (!this.namespaceImports.some((i) => i.source === source)) {
+      this.namespaceImports.push({ source, alias });
+    }
+  }
+
   /**
    * Adds a property to the `defineBackend({ ... })` call.
    */
@@ -122,6 +132,12 @@ export class BackendGenerator implements Planner {
             nodes.push(createImportDeclaration(imp.source, imp.identifiers));
           }
 
+          // Namespace imports (import * as X from 'source'), sorted by importOrder
+          const sortedNamespaceImports = [...this.namespaceImports].sort((a, b) => importOrder(a.source) - importOrder(b.source));
+          for (const ns of sortedNamespaceImports) {
+            nodes.push(createNamespaceImportDeclaration(ns.source, ns.alias));
+          }
+
           // Sort defineBackend properties: auth first, then data, storage, then functions
           const sortedProperties = [...this.defineBackendProperties].sort((a, b) => {
             const getName = (prop: ts.ObjectLiteralElementLike): string => {
@@ -197,6 +213,14 @@ function createImportDeclaration(source: string, identifiers: string[]): ts.Impo
   );
 }
 
+function createNamespaceImportDeclaration(source: string, alias: string): ts.ImportDeclaration {
+  return factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(alias))),
+    factory.createStringLiteral(source),
+  );
+}
+
 /**
  * Returns a numeric sort key for import source paths.
  *
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.generator.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.generator.ts
index e6f90dd5fc2..19de4a65f26 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.generator.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.generator.ts
@@ -1,5 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
+import { existsSync, readdirSync } from 'node:fs';
 import ts from 'typescript';
 import { GraphqlApi } from '@aws-sdk/client-appsync';
 import { Planner } from '../../../_infra/planner';
@@ -7,10 +8,122 @@ import { AmplifyMigrationOperation } from '../../../_infra/operation';
 import { BackendGenerator } from '../backend.generator';
 import { Gen1App, DiscoveredResource } from '../../_infra/gen1-app';
 import { TS } from '../../_infra/ts';
-import { DataRenderer, DataTableMapping } from './data.renderer';
+import { DataRenderer, DataTableMapping, ExtendedResolverFunctionEntry } from './data.renderer';
 
 const factory = ts.factory;
 
+/** Query-specific valid slots in pipeline execution order. */
+const QUERY_VALID_SLOTS = ['init', 'preAuth', 'auth', 'postAuth', 'preDataLoad', 'postDataLoad', 'finish'] as const;
+
+/** Mutation-specific valid slots in pipeline execution order. */
+const MUTATION_VALID_SLOTS = ['init', 'preAuth', 'auth', 'postAuth', 'preUpdate', 'postUpdate', 'finish'] as const;
+
+/** Subscription-specific valid slots in pipeline execution order. */
+const SUBSCRIPTION_VALID_SLOTS = ['init', 'preAuth', 'auth', 'postAuth', 'preSubscribe'] as const;
+
+/** Valid pipeline resolver slots — union of all operation types for backward compatibility. */
+export const VALID_SLOTS = [
+  'init',
+  'preAuth',
+  'auth',
+  'postAuth',
+  'preDataLoad',
+  'postDataLoad',
+  'preUpdate',
+  'postUpdate',
+  'preSubscribe',
+  'finish',
+] as const;
+
+/** A named position within a pipeline resolver. */
+export type Slot = (typeof VALID_SLOTS)[number];
+
+/** Base indexes for pipelines WITHOUT init0: Query, Delete Mutation, Subscription [auth0(0), postAuth0(1), DataResolverFn(2)]. */
+const THREE_FN_BASE_INDEX: Record<string, number> = {
+  init: 0,
+  preAuth: 0,
+  auth: 1,
+  postAuth: 2,
+  preDataLoad: 2,
+  postDataLoad: 3,
+  preUpdate: 2,
+  postUpdate: 3,
+  preSubscribe: 2,
+  finish: 3,
+};
+
+/** Base indexes for pipelines WITH init0: Create/Update Mutation [init0(0), auth0(1), postAuth0(2), DataResolverFn(3)]. */
+const FOUR_FN_BASE_INDEX: Record<string, number> = {
+  init: 1,
+  preAuth: 1,
+  auth: 2,
+  postAuth: 3,
+  preUpdate: 3,
+  postUpdate: 4,
+  finish: 4,
+};
+
+/** Returns the valid slot array for the given operation type. */
+export function getValidSlots(typeName: string): readonly string[] {
+  switch (typeName) {
+    case 'Query':
+      return QUERY_VALID_SLOTS;
+    case 'Mutation':
+      return MUTATION_VALID_SLOTS;
+    case 'Subscription':
+      return SUBSCRIPTION_VALID_SLOTS;
+    default:
+      return VALID_SLOTS;
+  }
+}
+
+/** Returns the base index record for the given operation type and field name. */
+export function getSlotBaseIndex(typeName: string, fieldName: string): Record<string, number> {
+  switch (typeName) {
+    case 'Query':
+    case 'Subscription':
+      return THREE_FN_BASE_INDEX;
+    case 'Mutation':
+      if (fieldName.startsWith('delete')) return THREE_FN_BASE_INDEX;
+      return FOUR_FN_BASE_INDEX;
+    default:
+      return FOUR_FN_BASE_INDEX;
+  }
+}
+
+/** Parsed components of an extended resolver VTL filename. */
+export interface ExtendedResolverDescriptor {
+  readonly typeName: string;
+  readonly fieldName: string;
+  readonly slot: Slot;
+  readonly order: number;
+  readonly templateType: 'req' | 'res';
+  readonly filename: string;
+}
+
+/** A paired extended resolver function with request and/or response templates. */
+export interface ExtendedResolverFunction {
+  readonly typeName: string;
+  readonly fieldName: string;
+  readonly slot: Slot;
+  readonly order: number;
+  readonly requestFile: string | undefined;
+  readonly responseFile: string | undefined;
+}
+
+/** Extended resolver functions grouped by pipeline resolver. */
+export interface PipelineResolverGroup {
+  readonly typeName: string;
+  readonly fieldName: string;
+  readonly functions: readonly ExtendedResolverFunction[];
+}
+
+/** VTL files classified as override or extended resolvers. */
+export interface ClassifiedResolvers {
+  readonly overrideFiles: readonly string[];
+  readonly extendedDescriptors: readonly ExtendedResolverDescriptor[];
+}
+
 /**
  * Generates the AppSync/GraphQL data resource and contributes to backend.ts.
  *
@@ -61,8 +174,10 @@ export class DataGenerator implements Planner {
     const logging = extractLoggingConfig(graphqlApi);
     const dataDir = path.join(this.outputDir, 'amplify', 'data');
     const hasAuth = this.gen1App.meta('auth') !== undefined;
+    const vtlFiles = findResolverVtlFiles(apiName);
+    const classified = vtlFiles.length > 0 ? classifyResolverFiles(vtlFiles) : { overrideFiles: [], extendedDescriptors: [] };
 
-    return [
+    const operations: AmplifyMigrationOperation[] = [
       {
         resource: this.resource,
         validate: () => undefined,
@@ -91,9 +206,25 @@ export class DataGenerator implements Planner {
           if (hasAuth) {
             this.contributeIamAuthGrant(apiId, authorizationModes, additionalAuthProviders);
           }
+
+          if (vtlFiles.length > 0) {
+            this.contributeResolverCommonDeclarations();
+          }
+          if (classified.overrideFiles.length > 0) {
+            this.contributeResolverOverrides();
+          }
+          if (classified.extendedDescriptors.length > 0) {
+            this.contributeExtendedResolvers(classified.extendedDescriptors);
+          }
         },
       },
     ];
+
+    if (vtlFiles.length > 0) {
+      operations.push(this.createCopyResolversOperation(apiName, vtlFiles));
+    }
+
+    return operations;
   }
 
   /**
@@ -274,6 +405,541 @@ export class DataGenerator implements Planner {
 
     this.backendGenerator.addStatement(addToPrincipalPolicy);
   }
+
+  /**
+   * Creates an operation that copies VTL resolver files from the Gen1
+   * local project to the Gen2 output directory.
+   */
+  private createCopyResolversOperation(apiName: string, vtlFiles: readonly string[]): AmplifyMigrationOperation {
+    const sourceDir = path.join(process.cwd(), 'amplify', 'backend', 'api', apiName, 'resolvers');
+    const destDir = path.join(this.outputDir, 'amplify', 'data', 'resolvers');
+
+    return {
+      resource: this.resource,
+      validate: () => undefined,
+      describe: async () => [`Copy ${vtlFiles.length} VTL resolver file(s) to amplify/data/resolvers/`],
+      execute: async () => {
+        await fs.mkdir(destDir, { recursive: true });
+        for (const file of vtlFiles) {
+          await fs.copyFile(path.join(sourceDir, file), path.join(destDir, file));
+        }
+      },
+    };
+  }
+
+  /**
+   * Contributes shared declarations needed by both override and extended resolver paths.
+   */
+  private contributeResolverCommonDeclarations(): void {
+    this.backendGenerator.addImport('path', ['join', 'dirname']);
+    this.backendGenerator.addImport('url', ['fileURLToPath']);
+
+    // const __dirname = dirname(fileURLToPath(import.meta.url));
+    this.backendGenerator.addStatement(
+      TS.constDecl(
+        '__dirname',
+        factory.createCallExpression(factory.createIdentifier('dirname'), undefined, [
+          factory.createCallExpression(factory.createIdentifier('fileURLToPath'), undefined, [
+            factory.createPropertyAccessExpression(
+              factory.createMetaProperty(ts.SyntaxKind.ImportKeyword, factory.createIdentifier('meta')),
+              factory.createIdentifier('url'),
+            ),
+          ]),
+        ]),
+      ),
+    );
+
+    // const resolversDir = join(__dirname, "data/resolvers");
+    this.backendGenerator.addStatement(
+      TS.constDecl(
+        'resolversDir',
+        factory.createCallExpression(factory.createIdentifier('join'), undefined, [
+          factory.createIdentifier('__dirname'),
+          factory.createStringLiteral('data/resolvers'),
+        ]),
+      ),
+    );
+  }
+
+  /**
+   * Contributes resolver override statements to backend.ts.
+   *
+   * Generates code that reads VTL files from `data/resolvers/` at deploy
+   * time, uploads them as CDK Assets to S3, and overrides the pipeline
+   * function mapping template S3 locations.
+   */
+  private contributeResolverOverrides(): void {
+    this.backendGenerator.addImport('fs', ['readdirSync']);
+    this.backendGenerator.addNamespaceImport('aws-cdk-lib/aws-s3-assets', 'assets');
+
+    // const resolverFiles = readdirSync(resolversDir).filter(f => (f.endsWith(".req.vtl") || f.endsWith(".res.vtl")) && f.split(".").length === 4);
+    this.backendGenerator.addStatement(
+      TS.constDecl(
+        'resolverFiles',
+        factory.createCallExpression(
+          factory.createPropertyAccessExpression(
+            factory.createCallExpression(factory.createIdentifier('readdirSync'), undefined, [factory.createIdentifier('resolversDir')]),
+            factory.createIdentifier('filter'),
+          ),
+          undefined,
+          [
+            factory.createArrowFunction(
+              undefined,
+              undefined,
+              [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier('f'))],
+              undefined,
+              factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+              factory.createBinaryExpression(
+                factory.createParenthesizedExpression(
+                  factory.createBinaryExpression(
+                    factory.createCallExpression(
+                      factory.createPropertyAccessExpression(factory.createIdentifier('f'), factory.createIdentifier('endsWith')),
+                      undefined,
+                      [factory.createStringLiteral('.req.vtl')],
+                    ),
+                    factory.createToken(ts.SyntaxKind.BarBarToken),
+                    factory.createCallExpression(
+                      factory.createPropertyAccessExpression(factory.createIdentifier('f'), factory.createIdentifier('endsWith')),
+                      undefined,
+                      [factory.createStringLiteral('.res.vtl')],
+                    ),
+                  ),
+                ),
+                factory.createToken(ts.SyntaxKind.AmpersandAmpersandToken),
+                factory.createBinaryExpression(
+                  factory.createPropertyAccessExpression(
+                    factory.createCallExpression(
+                      factory.createPropertyAccessExpression(factory.createIdentifier('f'), factory.createIdentifier('split')),
+                      undefined,
+                      [factory.createStringLiteral('.')],
+                    ),
+                    factory.createIdentifier('length'),
+                  ),
+                  factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+                  factory.createNumericLiteral('4'),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    // for (const file of resolverFiles) { ... }
+    this.backendGenerator.addStatement(this.buildResolverForOfLoop());
+  }
+
+  /**
+   * Builds the for-of loop that processes each resolver file.
+   *
+   * Generates:
+   * ```ts
+   * for (const file of resolverFiles) {
+   *   const parts = file.replace(".req.vtl", "").replace(".res.vtl", "").split(".");
+   *   const [typeName, fieldName] = parts;
+   *   const isRequest = file.endsWith(".req.vtl");
+   *   const functionId = `${typeName}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}DataResolverFn`;
+   *   const pipelineFunction = backend.data.resources.cfnResources.cfnFunctionConfigurations[functionId];
+   *   if (pipelineFunction) {
+   *     const templatePath = join(resolversDir, file);
+   *     const vtlTemplate = new assets.Asset(backend.data, `VTLTemplate-${file}`, { path: templatePath });
+   *     if (isRequest) {
+   *       pipelineFunction.requestMappingTemplateS3Location = vtlTemplate.s3ObjectUrl;
+   *     } else {
+   *       pipelineFunction.responseMappingTemplateS3Location = vtlTemplate.s3ObjectUrl;
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  private buildResolverForOfLoop(): ts.ForOfStatement {
+    // const parts = file.replace(".req.vtl", "").replace(".res.vtl", "").split(".");
+    const partsStatement = TS.constDecl(
+      'parts',
+      factory.createCallExpression(
+        factory.createPropertyAccessExpression(
+          factory.createCallExpression(
+            factory.createPropertyAccessExpression(
+              factory.createCallExpression(
+                factory.createPropertyAccessExpression(factory.createIdentifier('file'), factory.createIdentifier('replace')),
+                undefined,
+                [factory.createStringLiteral('.req.vtl'), factory.createStringLiteral('')],
+              ),
+              factory.createIdentifier('replace'),
+            ),
+            undefined,
+            [factory.createStringLiteral('.res.vtl'), factory.createStringLiteral('')],
+          ),
+          factory.createIdentifier('split'),
+        ),
+        undefined,
+        [factory.createStringLiteral('.')],
+      ),
+    );
+
+    // const [typeName, fieldName] = parts;
+    const destructureStatement = factory.createVariableStatement(
+      [],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            factory.createArrayBindingPattern([
+              factory.createBindingElement(undefined, undefined, 'typeName'),
+              factory.createBindingElement(undefined, undefined, 'fieldName'),
+            ]),
+            undefined,
+            undefined,
+            factory.createIdentifier('parts'),
+          ),
+        ],
+        ts.NodeFlags.Const,
+      ),
+    );
+
+    // const isRequest = file.endsWith(".req.vtl");
+    const isRequestStatement = TS.constDecl(
+      'isRequest',
+      factory.createCallExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier('file'), factory.createIdentifier('endsWith')),
+        undefined,
+        [factory.createStringLiteral('.req.vtl')],
+      ),
+    );
+
+    // const functionId = `${typeName}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}DataResolverFn`;
+    const functionIdStatement = factory.createVariableStatement(
+      [],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            'functionId',
+            undefined,
+            undefined,
+            factory.createTemplateExpression(factory.createTemplateHead(''), [
+              factory.createTemplateSpan(factory.createIdentifier('typeName'), factory.createTemplateMiddle('')),
+              factory.createTemplateSpan(
+                factory.createBinaryExpression(
+                  factory.createCallExpression(
+                    factory.createPropertyAccessExpression(
+                      factory.createCallExpression(
+                        factory.createPropertyAccessExpression(factory.createIdentifier('fieldName'), factory.createIdentifier('charAt')),
+                        undefined,
+                        [factory.createNumericLiteral('0')],
+                      ),
+                      factory.createIdentifier('toUpperCase'),
+                    ),
+                    undefined,
+                    [],
+                  ),
+                  factory.createToken(ts.SyntaxKind.PlusToken),
+                  factory.createCallExpression(
+                    factory.createPropertyAccessExpression(factory.createIdentifier('fieldName'), factory.createIdentifier('slice')),
+                    undefined,
+                    [factory.createNumericLiteral('1')],
+                  ),
+                ),
+                factory.createTemplateTail('DataResolverFn'),
+              ),
+            ]),
+          ),
+        ],
+        ts.NodeFlags.Const,
+      ),
+    );
+
+    // const pipelineFunction = backend.data.resources.cfnResources.cfnFunctionConfigurations[functionId];
+    const pipelineFunctionStatement = factory.createVariableStatement(
+      [],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            'pipelineFunction',
+            undefined,
+            undefined,
+            factory.createElementAccessExpression(
+              TS.propAccess('backend', 'data', 'resources', 'cfnResources', 'cfnFunctionConfigurations'),
+              factory.createIdentifier('functionId'),
+            ),
+          ),
+        ],
+        ts.NodeFlags.Const,
+      ),
+    );
+
+    // if (pipelineFunction) { ... }
+    const ifStatement = factory.createIfStatement(
+      factory.createIdentifier('pipelineFunction'),
+      factory.createBlock(
+        [
+          // const templatePath = join(resolversDir, file);
+          TS.constDecl(
+            'templatePath',
+            factory.createCallExpression(factory.createIdentifier('join'), undefined, [
+              factory.createIdentifier('resolversDir'),
+              factory.createIdentifier('file'),
+            ]),
+          ),
+          // const vtlTemplate = new assets.Asset(backend.data, `VTLTemplate-${file}`, { path: templatePath });
+          TS.constDecl(
+            'vtlTemplate',
+            factory.createNewExpression(
+              factory.createPropertyAccessExpression(factory.createIdentifier('assets'), factory.createIdentifier('Asset')),
+              undefined,
+              [
+                TS.propAccess('backend', 'data') as ts.Expression,
+                factory.createTemplateExpression(factory.createTemplateHead('VTLTemplate-'), [
+                  factory.createTemplateSpan(factory.createIdentifier('file'), factory.createTemplateTail('')),
+                ]),
+                factory.createObjectLiteralExpression(
+                  [factory.createPropertyAssignment('path', factory.createIdentifier('templatePath'))],
+                  false,
+                ),
+              ],
+            ),
+          ),
+          // if (isRequest) { ... } else { ... }
+          factory.createIfStatement(
+            factory.createIdentifier('isRequest'),
+            factory.createBlock(
+              [
+                factory.createExpressionStatement(
+                  factory.createAssignment(
+                    factory.createPropertyAccessExpression(
+                      factory.createIdentifier('pipelineFunction'),
+                      factory.createIdentifier('requestMappingTemplateS3Location'),
+                    ),
+                    factory.createPropertyAccessExpression(
+                      factory.createIdentifier('vtlTemplate'),
+                      factory.createIdentifier('s3ObjectUrl'),
+                    ),
+                  ),
+                ),
+              ],
+              true,
+            ),
+            factory.createBlock(
+              [
+                factory.createExpressionStatement(
+                  factory.createAssignment(
+                    factory.createPropertyAccessExpression(
+                      factory.createIdentifier('pipelineFunction'),
+                      factory.createIdentifier('responseMappingTemplateS3Location'),
+                    ),
+                    factory.createPropertyAccessExpression(
+                      factory.createIdentifier('vtlTemplate'),
+                      factory.createIdentifier('s3ObjectUrl'),
+                    ),
+                  ),
+                ),
+              ],
+              true,
+            ),
+          ),
+        ],
+        true,
+      ),
+    );
+
+    return factory.createForOfStatement(
+      undefined,
+      factory.createVariableDeclarationList(
+        [factory.createVariableDeclaration('file', undefined, undefined, undefined)],
+        ts.NodeFlags.Const,
+      ),
+      factory.createIdentifier('resolverFiles'),
+      factory.createBlock(
+        [partsStatement, destructureStatement, isRequestStatement, functionIdStatement, pipelineFunctionStatement, ifStatement],
+        true,
+      ),
+    );
+  }
+
+  /** Contributes extended resolver function and pipeline splice statements to backend.ts. */
+  private contributeExtendedResolvers(descriptors: readonly ExtendedResolverDescriptor[]): void {
+    this.backendGenerator.addImport('aws-cdk-lib', ['aws_appsync']);
+    this.backendGenerator.addImport('aws-cdk-lib/aws-appsync', ['CfnResolver']);
+
+    const groups = groupExtendedResolvers(descriptors);
+
+    this.backendGenerator.addStatement(this.defineData.renderNoneDataSource());
+
+    for (const group of groups) {
+      const indexed = computeSpliceIndexes(group);
+
+      for (const { fn, spliceIndex } of indexed) {
+        const entry: ExtendedResolverFunctionEntry = {
+          typeName: fn.typeName,
+          fieldName: fn.fieldName,
+          slot: fn.slot,
+          order: fn.order,
+          requestFile: fn.requestFile,
+          responseFile: fn.responseFile,
+          spliceIndex,
+        };
+        this.backendGenerator.addStatement(this.defineData.renderAppsyncFunction(entry));
+      }
+
+      const spliceArgs = indexed.map(({ fn, spliceIndex }) => ({
+        constructName: `${fn.typeName}${fn.fieldName}${fn.slot}${fn.order}`,
+        spliceIndex,
+      }));
+      const spliceStatements = this.defineData.renderSpliceStatements(group.typeName, group.fieldName, spliceArgs);
+      for (const stmt of spliceStatements) {
+        this.backendGenerator.addStatement(stmt);
+      }
+    }
+  }
+}
+
+/**
+ * Finds VTL resolver files in the local Gen1 project's resolvers directory.
+ * Returns an empty array if the directory doesn't exist or has no VTL files.
+ */
+function findResolverVtlFiles(apiName: string): readonly string[] {
+  const resolversPath = path.join(process.cwd(), 'amplify', 'backend', 'api', apiName, 'resolvers');
+  if (!existsSync(resolversPath)) return [];
+  return readdirSync(resolversPath).filter((file) => file.endsWith('.vtl'));
+}
+
+/** Parses an extended resolver VTL filename into its components. */
+export function parseExtendedResolverFilename(filename: string): ExtendedResolverDescriptor {
+  const segments = filename.split('.');
+  const typeName = segments[0];
+  const fieldName = segments[1];
+  const slot = segments[2];
+  const orderStr = segments[3];
+  const templateType = segments[4] as 'req' | 'res';
+
+  if (!(getValidSlots(typeName) as readonly string[]).includes(slot)) {
+    throw new Error(
+      `Invalid slot '${slot}' in resolver file '${filename}'. Valid slots for ${typeName}: ${getValidSlots(typeName).join(', ')}`,
+    );
+  }
+
+  const order = Number(orderStr);
+  if (Number.isNaN(order)) {
+    throw new Error(`Non-numeric order '${orderStr}' in resolver file '${filename}'`);
+  }
+
+  return { typeName, fieldName, slot: slot as Slot, order, templateType, filename };
+}
+
+/** Classifies VTL resolver files as override or extended resolvers. */
+export function classifyResolverFiles(vtlFiles: readonly string[]): ClassifiedResolvers {
+  const overrideFiles: string[] = [];
+  const extendedDescriptors: ExtendedResolverDescriptor[] = [];
+
+  for (const file of vtlFiles) {
+    const segmentCount = file.split('.').length;
+    if (segmentCount === 4) {
+      overrideFiles.push(file);
+    } else if (segmentCount === 6) {
+      extendedDescriptors.push(parseExtendedResolverFilename(file));
+    }
+  }
+
+  for (let i = 0; i < extendedDescriptors.length; i++) {
+    for (let j = i + 1; j < extendedDescriptors.length; j++) {
+      const a = extendedDescriptors[i];
+      const b = extendedDescriptors[j];
+      if (
+        a.typeName === b.typeName &&
+        a.fieldName === b.fieldName &&
+        a.slot === b.slot &&
+        a.order === b.order &&
+        a.templateType === b.templateType
+      ) {
+        throw new Error(
+          `Duplicate extended resolver template: '${a.filename}' and '${b.filename}' both define ${a.templateType} for ${a.typeName}.${a.fieldName}.${a.slot}.${a.order}`,
+        );
+      }
+    }
+  }
+
+  return { overrideFiles, extendedDescriptors };
+}
+
+/** Groups extended resolver descriptors by pipeline resolver and pairs request/response templates. */
+export function groupExtendedResolvers(descriptors: readonly ExtendedResolverDescriptor[]): readonly PipelineResolverGroup[] {
+  const groups = new Map<string, ExtendedResolverDescriptor[]>();
+
+  for (const descriptor of descriptors) {
+    const key = `${descriptor.typeName}.${descriptor.fieldName}`;
+    const group = groups.get(key);
+    if (group) {
+      group.push(descriptor);
+    } else {
+      groups.set(key, [descriptor]);
+    }
+  }
+
+  const result: PipelineResolverGroup[] = [];
+
+  for (const [, groupDescriptors] of groups) {
+    const sorted = [...groupDescriptors].sort((a, b) => {
+      const validSlots = getValidSlots(a.typeName);
+      const slotDiff = validSlots.indexOf(a.slot) - validSlots.indexOf(b.slot);
+      if (slotDiff !== 0) return slotDiff;
+      return a.order - b.order;
+    });
+
+    const pairMap = new Map<string, { req?: string; res?: string }>();
+    for (const desc of sorted) {
+      const pairKey = `${desc.slot}.${desc.order}`;
+      const existing = pairMap.get(pairKey) ?? {};
+      if (desc.templateType === 'req') {
+        existing.req = desc.filename;
+      } else {
+        existing.res = desc.filename;
+      }
+      pairMap.set(pairKey, existing);
+    }
+
+    const functions: ExtendedResolverFunction[] = [];
+    const seen = new Set<string>();
+
+    for (const desc of sorted) {
+      const pairKey = `${desc.slot}.${desc.order}`;
+      if (seen.has(pairKey)) continue;
+      seen.add(pairKey);
+
+      const pair = pairMap.get(pairKey)!;
+      functions.push({
+        typeName: desc.typeName,
+        fieldName: desc.fieldName,
+        slot: desc.slot,
+        order: desc.order,
+        requestFile: pair.req,
+        responseFile: pair.res,
+      });
+    }
+
+    result.push({
+      typeName: sorted[0].typeName,
+      fieldName: sorted[0].fieldName,
+      functions,
+    });
+  }
+
+  return result;
+}
+
+/** Computes splice indexes for extended resolver functions within a pipeline resolver group. */
+export function computeSpliceIndexes(
+  group: PipelineResolverGroup,
+): readonly { readonly fn: ExtendedResolverFunction; readonly spliceIndex: number }[] {
+  const slotBaseIndex = getSlotBaseIndex(group.typeName, group.fieldName);
+  const result: { readonly fn: ExtendedResolverFunction; readonly spliceIndex: number }[] = [];
+  let offset = 0;
+
+  for (const fn of group.functions) {
+    const baseIndex = slotBaseIndex[fn.slot];
+    const spliceIndex = baseIndex + offset;
+    result.push({ fn, spliceIndex });
+    offset++;
+  }
+
+  return result;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- untyped JSON from AppSync logConfig
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.renderer.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.renderer.ts
index 21c5c6cc06f..cc5adeeb8bf 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.renderer.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/data/data.renderer.ts
@@ -20,6 +20,26 @@ export interface RenderDefineDataOptions {
   readonly logging?: any;
 }
 
+/** Describes a single extended resolver function with its computed splice index. */
+export interface ExtendedResolverFunctionEntry {
+  readonly typeName: string;
+  readonly fieldName: string;
+  readonly slot: string;
+  readonly order: number;
+  readonly requestFile: string | undefined;
+  readonly responseFile: string | undefined;
+  readonly spliceIndex: number;
+}
+
+/** Options for rendering extended resolver statements in backend.ts. */
+export interface RenderExtendedResolverOptions {
+  readonly groups: readonly {
+    readonly typeName: string;
+    readonly fieldName: string;
+    readonly functions: readonly ExtendedResolverFunctionEntry[];
+  }[];
+}
+
 const MIGRATED_TABLE_MAPPINGS_KEY = 'migratedAmplifyGen1DynamoDbTableMappings';
 
 const AUTH_MODE_MAP: Record<string, string> = {
@@ -73,6 +93,120 @@ export class DataRenderer {
     });
   }
 
+  /** Renders a NoneDataSource declaration statement. */
+  public renderNoneDataSource(): ts.Statement {
+    const graphqlApi = TS.propAccess('backend', 'data', 'resources', 'graphqlApi');
+    const addNoneCall = factory.createCallExpression(factory.createPropertyAccessExpression(graphqlApi, 'addNoneDataSource'), undefined, [
+      factory.createStringLiteral('none'),
+    ]);
+    return TS.constDecl('noneDataSource', addNoneCall);
+  }
+
+  /** Renders an AppsyncFunction declaration for an extended resolver. */
+  public renderAppsyncFunction(fn: ExtendedResolverFunctionEntry): ts.Statement {
+    const constructName = `${fn.typeName}${fn.fieldName}${fn.slot}${fn.order}`;
+
+    const graphqlApi = TS.propAccess('backend', 'data', 'resources', 'graphqlApi');
+    const awsAppsync = factory.createIdentifier('aws_appsync');
+
+    const requestMapping =
+      fn.requestFile !== undefined
+        ? factory.createCallExpression(TS.propAccess(awsAppsync, 'MappingTemplate', 'fromFile'), undefined, [
+            factory.createCallExpression(factory.createIdentifier('join'), undefined, [
+              factory.createIdentifier('resolversDir'),
+              factory.createStringLiteral(fn.requestFile),
+            ]),
+          ])
+        : factory.createCallExpression(TS.propAccess(awsAppsync, 'MappingTemplate', 'fromString'), undefined, [
+            factory.createStringLiteral('$util.toJson({})'),
+          ]);
+
+    const responseMapping =
+      fn.responseFile !== undefined
+        ? factory.createCallExpression(TS.propAccess(awsAppsync, 'MappingTemplate', 'fromFile'), undefined, [
+            factory.createCallExpression(factory.createIdentifier('join'), undefined, [
+              factory.createIdentifier('resolversDir'),
+              factory.createStringLiteral(fn.responseFile),
+            ]),
+          ])
+        : factory.createCallExpression(TS.propAccess(awsAppsync, 'MappingTemplate', 'fromString'), undefined, [
+            factory.createStringLiteral('$util.toJson($ctx.prev.result)'),
+          ]);
+
+    const properties: ts.ObjectLiteralElementLike[] = [
+      factory.createPropertyAssignment('name', factory.createStringLiteral(constructName)),
+      factory.createPropertyAssignment('api', graphqlApi),
+      factory.createPropertyAssignment('dataSource', factory.createIdentifier('noneDataSource')),
+      factory.createPropertyAssignment('requestMappingTemplate', requestMapping),
+      factory.createPropertyAssignment('responseMappingTemplate', responseMapping),
+    ];
+
+    const newExpr = factory.createNewExpression(TS.propAccess(awsAppsync, 'AppsyncFunction'), undefined, [
+      TS.propAccess('backend', 'data', 'stack'),
+      factory.createStringLiteral(constructName),
+      factory.createObjectLiteralExpression(properties, true),
+    ]);
+
+    return TS.constDecl(constructName, newExpr);
+  }
+
+  /** Renders statements to splice extended resolver functions into a pipeline resolver. */
+  public renderSpliceStatements(
+    typeName: string,
+    fieldName: string,
+    functions: readonly { readonly constructName: string; readonly spliceIndex: number }[],
+  ): ts.Statement[] {
+    const resolverVarName = `${typeName.toLowerCase()}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}Resolver`;
+    const pipelineFunctionsVarName = `${resolverVarName.replace('Resolver', '')}PipelineFunctions`;
+
+    // const queryListProductsResolver = backend.data.resources.cfnResources.cfnResolvers['Query.listProducts'] as CfnResolver;
+    const resolverAccess = factory.createElementAccessExpression(
+      TS.propAccess('backend', 'data', 'resources', 'cfnResources', 'cfnResolvers'),
+      factory.createStringLiteral(`${typeName}.${fieldName}`),
+    );
+    const resolverAsExpr = factory.createAsExpression(resolverAccess, factory.createTypeReferenceNode('CfnResolver'));
+    const resolverDecl = TS.constDecl(resolverVarName, resolverAsExpr);
+
+    // const queryListProductsPipelineFunctions = (queryListProductsResolver.pipelineConfig as CfnResolver.PipelineConfigProperty).functions || [];
+    const pipelineConfigAccess = factory.createPropertyAccessExpression(factory.createIdentifier(resolverVarName), 'pipelineConfig');
+    const pipelineConfigCast = factory.createAsExpression(
+      pipelineConfigAccess,
+      factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier('CfnResolver'), 'PipelineConfigProperty')),
+    );
+    const functionsAccess = factory.createPropertyAccessExpression(factory.createParenthesizedExpression(pipelineConfigCast), 'functions');
+    const functionsOrEmpty = factory.createBinaryExpression(
+      functionsAccess,
+      ts.SyntaxKind.BarBarToken,
+      factory.createArrayLiteralExpression([]),
+    );
+    const pipelineFunctionsDecl = TS.constDecl(pipelineFunctionsVarName, functionsOrEmpty);
+
+    const statements: ts.Statement[] = [resolverDecl, pipelineFunctionsDecl];
+
+    // Generate splice calls for each function
+    for (const fn of functions) {
+      const spliceCall = factory.createCallExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier(pipelineFunctionsVarName), 'splice'),
+        undefined,
+        [factory.createNumericLiteral(fn.spliceIndex), factory.createNumericLiteral(0), TS.propAccess(fn.constructName, 'functionId')],
+      );
+      statements.push(factory.createExpressionStatement(spliceCall));
+    }
+
+    // queryListProductsResolver.pipelineConfig = { functions: queryListProductsPipelineFunctions };
+    const reassignment = factory.createExpressionStatement(
+      factory.createAssignment(
+        factory.createPropertyAccessExpression(factory.createIdentifier(resolverVarName), 'pipelineConfig'),
+        factory.createObjectLiteralExpression([
+          factory.createPropertyAssignment('functions', factory.createIdentifier(pipelineFunctionsVarName)),
+        ]),
+      ),
+    );
+    statements.push(reassignment);
+
+    return statements;
+  }
+
   private prepareSchema(raw: string): { schema: string; preSchemaStatements: ts.Node[] } {
     if (!raw.includes('${env}')) {
       return { schema: raw, preSchemaStatements: [] };