diff --git a/amplify/backend/custom/searchByBounds/package-lock.json b/amplify/backend/custom/searchByBounds/package-lock.json
index 8b156a4f..021e17ed 100644
--- a/amplify/backend/custom/searchByBounds/package-lock.json
+++ b/amplify/backend/custom/searchByBounds/package-lock.json
@@ -315,7 +315,7 @@
     },
     "node_modules/@aws-cdk/aws-cognito/node_modules/punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "resolved": "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "inBundle": true,
       "license": "MIT",
@@ -441,14 +441,14 @@
     },
     "node_modules/@aws-cdk/aws-ecr-assets/node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "resolved": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/@aws-cdk/aws-ecr-assets/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "resolved": "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "inBundle": true,
       "license": "MIT",
@@ -459,7 +459,7 @@
     },
     "node_modules/@aws-cdk/aws-ecr-assets/node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "resolved": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "inBundle": true,
       "license": "MIT"
@@ -1019,7 +1019,7 @@
     },
     "node_modules/@aws-cdk/cloud-assembly-schema/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "inBundle": true,
       "license": "ISC",
@@ -1046,7 +1046,7 @@
     },
     "node_modules/@aws-cdk/cloud-assembly-schema/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "inBundle": true,
       "license": "ISC"
@@ -1083,14 +1083,14 @@
     },
     "node_modules/@aws-cdk/core/node_modules/@balena/dockerignore": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+      "resolved": "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
       "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==",
       "inBundle": true,
       "license": "Apache-2.0"
     },
     "node_modules/@aws-cdk/core/node_modules/at-least-node": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "inBundle": true,
       "license": "ISC",
@@ -1100,14 +1100,14 @@
     },
     "node_modules/@aws-cdk/core/node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "resolved": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/@aws-cdk/core/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "resolved": "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "inBundle": true,
       "license": "MIT",
@@ -1118,14 +1118,14 @@
     },
     "node_modules/@aws-cdk/core/node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "resolved": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/@aws-cdk/core/node_modules/fs-extra": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "inBundle": true,
       "license": "MIT",
@@ -1154,11 +1154,12 @@
     },
     "node_modules/@aws-cdk/core/node_modules/jsonfile": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
+        "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
       },
       "optionalDependencies": {
@@ -1178,7 +1179,7 @@
     },
     "node_modules/@aws-cdk/core/node_modules/universalify": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "inBundle": true,
       "license": "MIT",
@@ -1234,7 +1235,7 @@
     },
     "node_modules/@aws-cdk/cx-api/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "inBundle": true,
       "license": "ISC",
@@ -1261,7 +1262,7 @@
     },
     "node_modules/@aws-cdk/cx-api/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "resolved": "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "inBundle": true,
       "license": "ISC"
@@ -1897,7 +1898,8 @@
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -2420,6 +2422,9 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dependencies": {
+        "graceful-fs": "^4.1.6"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -3795,7 +3800,7 @@
       "dependencies": {
         "punycode": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "resolved": "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz",
           "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
           "bundled": true
         }
@@ -3864,13 +3869,13 @@
       "dependencies": {
         "balanced-match": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+          "resolved": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz",
           "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
           "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "resolved": "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "bundled": true,
           "requires": {
@@ -3880,7 +3885,7 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "resolved": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true
         },
@@ -4187,7 +4192,7 @@
         },
         "lru-cache": {
           "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz",
           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "bundled": true,
           "requires": {
@@ -4203,7 +4208,7 @@
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "bundled": true
         }
@@ -4226,25 +4231,25 @@
       "dependencies": {
         "@balena/dockerignore": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+          "resolved": "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
           "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==",
           "bundled": true
         },
         "at-least-node": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz",
           "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
           "bundled": true
         },
         "balanced-match": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+          "resolved": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz",
           "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
           "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "resolved": "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "bundled": true,
           "requires": {
@@ -4254,13 +4259,13 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "resolved": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true
         },
         "fs-extra": {
           "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz",
           "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
           "bundled": true,
           "requires": {
@@ -4280,7 +4285,7 @@
         },
         "jsonfile": {
           "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz",
           "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
           "bundled": true,
           "requires": {
@@ -4297,7 +4302,7 @@
         },
         "universalify": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz",
           "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
           "bundled": true
         }
@@ -4329,7 +4334,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz",
           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "bundled": true,
           "requires": {
@@ -4345,7 +4350,7 @@
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "bundled": true
         }
diff --git a/amplify/backend/custom/searchByBounds/package.json b/amplify/backend/custom/searchByBounds/package.json
index 12e3cc30..d0d221c5 100644
--- a/amplify/backend/custom/searchByBounds/package.json
+++ b/amplify/backend/custom/searchByBounds/package.json
@@ -9,13 +9,13 @@
   },
   "dependencies": {
     "@aws-amplify/cli-extensibility-helper": "^2.0.0",
-    "@aws-cdk/core": "~1.124.0",
     "@aws-cdk/aws-iam": "~1.124.0",
+    "@aws-cdk/aws-sns": "~1.124.0",
     "@aws-cdk/aws-sns-subscriptions": "~1.124.0",
     "@aws-cdk/aws-sqs": "~1.124.0",
-    "@aws-cdk/aws-sns": "~1.124.0"
+    "@aws-cdk/core": "~1.124.0"
   },
   "devDependencies": {
     "typescript": "^4.2.4"
   }
-}
\ No newline at end of file
+}
diff --git a/amplify/backend/custom/searchByBounds/yarn.lock b/amplify/backend/custom/searchByBounds/yarn.lock
index f2b33dbb..5961efe6 100644
--- a/amplify/backend/custom/searchByBounds/yarn.lock
+++ b/amplify/backend/custom/searchByBounds/yarn.lock
@@ -530,7 +530,7 @@
 
 "@balena/dockerignore@^1.0.2":
   "integrity" "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q=="
-  "resolved" "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz"
+  "resolved" "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz"
   "version" "1.0.2"
 
 "@colors/colors@1.5.0":
@@ -750,17 +750,17 @@
 
 "at-least-node@^1.0.0":
   "integrity" "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
-  "resolved" "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
+  "resolved" "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"
   "version" "1.0.0"
 
 "balanced-match@^1.0.0":
   "integrity" "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-  "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  "resolved" "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"
   "version" "1.0.2"
 
 "brace-expansion@^1.1.7":
   "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-  "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  "resolved" "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"
   "version" "1.1.11"
   dependencies:
     "balanced-match" "^1.0.0"
@@ -1030,6 +1030,7 @@
     "estraverse" "^4.2.0"
     "esutils" "^2.0.2"
     "optionator" "^0.8.1"
+    "source-map" "~0.6.1"
   optionalDependencies:
     "source-map" "~0.6.1"
 
@@ -1152,7 +1153,7 @@
 
 "fs-extra@^9.1.0":
   "integrity" "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="
-  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
+  "resolved" "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"
   "version" "9.1.0"
   dependencies:
     "at-least-node" "^1.0.0"
@@ -1406,14 +1407,17 @@
   "integrity" "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="
   "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"
   "version" "4.0.0"
+  dependencies:
+    "graceful-fs" "^4.1.6"
   optionalDependencies:
     "graceful-fs" "^4.1.6"
 
 "jsonfile@^6.0.1":
   "integrity" "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="
-  "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
+  "resolved" "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"
   "version" "6.1.0"
   dependencies:
+    "graceful-fs" "^4.1.6"
     "universalify" "^2.0.0"
   optionalDependencies:
     "graceful-fs" "^4.1.6"
@@ -1686,7 +1690,7 @@
 
 "punycode@^2.1.1":
   "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-  "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+  "resolved" "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"
   "version" "2.1.1"
 
 "queue-microtask@^1.2.2":
@@ -2019,7 +2023,7 @@
 
 "universalify@^2.0.0":
   "integrity" "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-  "resolved" "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
+  "resolved" "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"
   "version" "2.0.0"
 
 "unpipe@1.0.0":
diff --git a/amplify/backend/package-lock.json b/amplify/backend/package-lock.json
index 1e90436a..c2a8b81f 100644
--- a/amplify/backend/package-lock.json
+++ b/amplify/backend/package-lock.json
@@ -15,11 +15,11 @@
       }
     },
     "node_modules/@aws-amplify/amplify-category-custom": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/amplify-category-custom/-/amplify-category-custom-2.4.2.tgz",
-      "integrity": "sha512-kdHwaUR825rsgmpXdZoTjvcPqMiGsLGwyw1oodZvDd013lXQZ2JuaLj1N5PsxFR0SmNKYepOyvOuBF37ysRX6Q==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/amplify-category-custom/-/amplify-category-custom-2.4.3.tgz",
+      "integrity": "sha512-/RXjxA+apGx0c0VxnAMIK7NbYYnSnu6mFSZ0R7diiOWEVmybhd2c4E68nffWaS0AcjATC2m3wdVh0TI7j15Tgg==",
       "dependencies": {
-        "amplify-cli-core": "2.11.0",
+        "amplify-cli-core": "2.12.0",
         "amplify-prompts": "2.2.0",
         "execa": "^5.1.1",
         "fs-extra": "^8.1.0",
@@ -30,11 +30,11 @@
       }
     },
     "node_modules/@aws-amplify/cli-extensibility-helper": {
-      "version": "2.3.32",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/cli-extensibility-helper/-/cli-extensibility-helper-2.3.32.tgz",
-      "integrity": "sha512-k3sa9NGBvMhcIPwORe7u+yFu4di9Kcei7wtlbmHzkZ6ViEJHioXvjxNX5Ksyrp+KkMnY31POw1BcktHHlJFx2Q==",
+      "version": "2.3.33",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/cli-extensibility-helper/-/cli-extensibility-helper-2.3.33.tgz",
+      "integrity": "sha512-dK/1/Q9wbdsOP5et49w+HTjuONMtTUnIZyijqCMH0zxWzfFi0mJ9afVd1BI8unQDcS8cjzARZMhDr/3uX5/ptw==",
       "dependencies": {
-        "@aws-amplify/amplify-category-custom": "2.4.2",
+        "@aws-amplify/amplify-category-custom": "2.4.3",
         "@aws-cdk/aws-apigateway": "~1.124.0",
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-cognito": "~1.124.0",
@@ -44,16 +44,15 @@
         "@aws-cdk/aws-lambda": "~1.124.0",
         "@aws-cdk/aws-s3": "~1.124.0",
         "@aws-cdk/core": "~1.124.0",
-        "amplify-cli-core": "2.11.0",
-        "amplify-prompts": "2.2.0"
+        "amplify-cli-core": "2.12.0"
       }
     },
     "node_modules/@aws-amplify/graphql-transformer-core": {
-      "version": "0.17.7",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-0.17.7.tgz",
-      "integrity": "sha512-72eZ/EHlOgYtLUQGSfO0WjmKqFH9f0Sd4Apxkt2JmKXxFW8zxdaPiDWWKLFL3soMFcWTeCmpWAWXX03x3Kiwgg==",
+      "version": "0.17.11",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-0.17.11.tgz",
+      "integrity": "sha512-ErjsrZ9ZhZeLfFS9bqAQBxpIwF/p85KBc3iVvlEWj9WedEZrWWO0aQHSZuYjJ5ENl5yUCz0roamXeqdt6K3qsg==",
       "dependencies": {
-        "@aws-amplify/graphql-transformer-interfaces": "1.14.4",
+        "@aws-amplify/graphql-transformer-interfaces": "1.14.7",
         "@aws-cdk/aws-applicationautoscaling": "~1.124.0",
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-certificatemanager": "~1.124.0",
@@ -93,9 +92,9 @@
       }
     },
     "node_modules/@aws-amplify/graphql-transformer-interfaces": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-1.14.4.tgz",
-      "integrity": "sha512-FXGeRQVSdRMg5j51bg7t9MbiJ7F2AB1CHC+U1AcH9wgWbVraWN4+yfaYjKbmQv1NB9p6BsSsQsDNDH7C9KSjuw==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-1.14.7.tgz",
+      "integrity": "sha512-UCpkRoYbt+GeZVnLSpasH96QZ0AOiZ59eXJWatMoRANMFbREytCP4xN/AyBV3MLEuWidAFpOXVB9e9TfLST5rQ==",
       "dependencies": {
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-cloudwatch": "~1.124.0",
@@ -475,7 +474,10 @@
       "resolved": "https://registry.npmjs.org/@aws-cdk/aws-ecr-assets/-/aws-ecr-assets-1.124.0.tgz",
       "integrity": "sha512-wsajG5+wqwZ9+0dS18bCtVe4X6noJT8WKNNoe8nSk2UkUZwtt0J56Y9P7qtCrnMQFysBjIH0EP7jT6BUIAq01Q==",
       "bundleDependencies": [
-        "minimatch"
+        "minimatch",
+        "balanced-match",
+        "brace-expansion",
+        "concat-map"
       ],
       "dependencies": {
         "@aws-cdk/assets": "1.124.0",
@@ -1028,7 +1030,9 @@
       "integrity": "sha512-emrkfHetGoh6lhrT7ato06VAZun1UVYjJueL9avHxFgzX5qiobP4iWk6M0EZpk7yHlDOtJtp86MJalYYMS6Oww==",
       "bundleDependencies": [
         "jsonschema",
-        "semver"
+        "semver",
+        "lru-cache",
+        "yallist"
       ],
       "dependencies": {
         "jsonschema": "^1.4.0",
@@ -1084,7 +1088,14 @@
         "fs-extra",
         "minimatch",
         "@balena/dockerignore",
-        "ignore"
+        "ignore",
+        "at-least-node",
+        "balanced-match",
+        "brace-expansion",
+        "concat-map",
+        "graceful-fs",
+        "jsonfile",
+        "universalify"
       ],
       "dependencies": {
         "@aws-cdk/cloud-assembly-schema": "1.124.0",
@@ -1170,6 +1181,7 @@
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
+        "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
       },
       "optionalDependencies": {
@@ -1228,7 +1240,9 @@
       "resolved": "https://registry.npmjs.org/@aws-cdk/cx-api/-/cx-api-1.124.0.tgz",
       "integrity": "sha512-InBcAoFJ0Ail7/IhJhhw2OwGyWgBv4HShRA20/czxvlQ2pOezcUxQOCJr5USM6dGvTOlDL38XVrw469m9boUzw==",
       "bundleDependencies": [
-        "semver"
+        "semver",
+        "lru-cache",
+        "yallist"
       ],
       "dependencies": {
         "@aws-cdk/cloud-assembly-schema": "1.124.0",
@@ -1396,14 +1410,14 @@
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
     "node_modules/@types/node": {
-      "version": "16.11.43",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz",
-      "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ=="
+      "version": "16.11.56",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.56.tgz",
+      "integrity": "sha512-aFcUkv7EddxxOa/9f74DINReQ/celqH8DiB3fRYgVDM2Xm5QJL8sl80QKuAnGvwAsMn+H3IFA6WCrQh1CY7m1A=="
     },
     "node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1446,12 +1460,12 @@
       }
     },
     "node_modules/amplify-cli-core": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/amplify-cli-core/-/amplify-cli-core-2.11.0.tgz",
-      "integrity": "sha512-oCq0k/cHY+tqE/izlNyK/kvy46HNCPCSqA1jJxItclkGfov8nUCy2PKpvwR1sSOVszu5/tpttP46XRBM7/sMHA==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/amplify-cli-core/-/amplify-cli-core-2.12.0.tgz",
+      "integrity": "sha512-X1Lba/1/HzjPu3RpIdGXjdYwufC7srsGc2jwn0VnGDz36+A5rht+fcHtI+hO4jr27EUTHu3te2EL2XeQxzniyg==",
       "dependencies": {
-        "@aws-amplify/graphql-transformer-core": "^0.17.6",
-        "@aws-amplify/graphql-transformer-interfaces": "^1.14.4",
+        "@aws-amplify/graphql-transformer-core": "^0.17.9",
+        "@aws-amplify/graphql-transformer-interfaces": "^1.14.6",
         "ajv": "^6.12.6",
         "amplify-cli-logger": "1.2.0",
         "amplify-prompts": "2.2.0",
@@ -1462,7 +1476,7 @@
         "execa": "^5.1.1",
         "fs-extra": "^8.1.0",
         "globby": "^11.0.3",
-        "graphql-transformer-core": "^7.6.2",
+        "graphql-transformer-core": "^7.6.5",
         "hjson": "^3.2.1",
         "js-yaml": "^4.0.0",
         "lodash": "^4.17.21",
@@ -1655,9 +1669,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
       "engines": {
         "node": ">=6"
       },
@@ -1758,9 +1772,9 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/constructs": {
-      "version": "3.4.39",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-3.4.39.tgz",
-      "integrity": "sha512-tj2m8GUD155rwQXmfHMZvMtBwexTEU4m7rxVkNWSShl1bkhyYV8gVi8hrrG8MtSiizkz4FheYPlkU+O3YIEo/w==",
+      "version": "3.4.84",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-3.4.84.tgz",
+      "integrity": "sha512-qBkMW/Q6d0HYplW+EMP0Bbt2rjQVgCzG6lA55i2PUf/6RbxRmkxHipjBCoBzlOf9vcdEx/h3maxtJv0K8AeCIA==",
       "engines": {
         "node": ">= 14.17.0"
       }
@@ -1940,7 +1954,8 @@
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -2252,9 +2267,9 @@
       }
     },
     "node_modules/graphql-transformer-core": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/graphql-transformer-core/-/graphql-transformer-core-7.6.3.tgz",
-      "integrity": "sha512-ACBnFHd8tgSKGSXvskEd+ClulyjLFcUdw6QAoOX01bez8qpUV97Vo/PY0WG2TXaPzC599iEk8DDmCFhEXBUhkA==",
+      "version": "7.6.5",
+      "resolved": "https://registry.npmjs.org/graphql-transformer-core/-/graphql-transformer-core-7.6.5.tgz",
+      "integrity": "sha512-L+AzvLg7tHdmEJuHQchB188g5C4COKWvKGAUsC2qIEyPoTb9cfj5zD0aFjfC7tGD4fAnRbZ3pps2WqBX8887Sg==",
       "dependencies": {
         "cloudform-types": "^4.2.0",
         "deep-diff": "^1.0.2",
@@ -2517,6 +2532,9 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dependencies": {
+        "graceful-fs": "^4.1.6"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -2690,9 +2708,9 @@
       }
     },
     "node_modules/moment": {
-      "version": "2.29.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
-      "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==",
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "engines": {
         "node": "*"
       }
@@ -3206,11 +3224,11 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
-      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
+      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
       "dependencies": {
-        "ip": "^1.1.5",
+        "ip": "^2.0.0",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
@@ -3231,6 +3249,11 @@
         "node": ">= 6"
       }
     },
+    "node_modules/socks/node_modules/ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -3363,9 +3386,9 @@
       }
     },
     "node_modules/ts-node": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.2.tgz",
-      "integrity": "sha512-LYdGnoGddf1D6v8REPtIH+5iq/gTDuZqv2/UJUU7tKjuEU8xVZorBM+buCGNjj+pGEud+sOoM4CX3/YzINpENA==",
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -3432,9 +3455,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -3515,9 +3538,9 @@
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
     },
     "node_modules/vm2": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.10.tgz",
-      "integrity": "sha512-AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ==",
+      "version": "3.9.11",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz",
+      "integrity": "sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -3733,9 +3756,9 @@
       }
     },
     "node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
         "node": ">=12"
       }
@@ -3751,11 +3774,11 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-custom": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/amplify-category-custom/-/amplify-category-custom-2.4.2.tgz",
-      "integrity": "sha512-kdHwaUR825rsgmpXdZoTjvcPqMiGsLGwyw1oodZvDd013lXQZ2JuaLj1N5PsxFR0SmNKYepOyvOuBF37ysRX6Q==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/amplify-category-custom/-/amplify-category-custom-2.4.3.tgz",
+      "integrity": "sha512-/RXjxA+apGx0c0VxnAMIK7NbYYnSnu6mFSZ0R7diiOWEVmybhd2c4E68nffWaS0AcjATC2m3wdVh0TI7j15Tgg==",
       "requires": {
-        "amplify-cli-core": "2.11.0",
+        "amplify-cli-core": "2.12.0",
         "amplify-prompts": "2.2.0",
         "execa": "^5.1.1",
         "fs-extra": "^8.1.0",
@@ -3766,11 +3789,11 @@
       }
     },
     "@aws-amplify/cli-extensibility-helper": {
-      "version": "2.3.32",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/cli-extensibility-helper/-/cli-extensibility-helper-2.3.32.tgz",
-      "integrity": "sha512-k3sa9NGBvMhcIPwORe7u+yFu4di9Kcei7wtlbmHzkZ6ViEJHioXvjxNX5Ksyrp+KkMnY31POw1BcktHHlJFx2Q==",
+      "version": "2.3.33",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/cli-extensibility-helper/-/cli-extensibility-helper-2.3.33.tgz",
+      "integrity": "sha512-dK/1/Q9wbdsOP5et49w+HTjuONMtTUnIZyijqCMH0zxWzfFi0mJ9afVd1BI8unQDcS8cjzARZMhDr/3uX5/ptw==",
       "requires": {
-        "@aws-amplify/amplify-category-custom": "2.4.2",
+        "@aws-amplify/amplify-category-custom": "2.4.3",
         "@aws-cdk/aws-apigateway": "~1.124.0",
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-cognito": "~1.124.0",
@@ -3780,16 +3803,15 @@
         "@aws-cdk/aws-lambda": "~1.124.0",
         "@aws-cdk/aws-s3": "~1.124.0",
         "@aws-cdk/core": "~1.124.0",
-        "amplify-cli-core": "2.11.0",
-        "amplify-prompts": "2.2.0"
+        "amplify-cli-core": "2.12.0"
       }
     },
     "@aws-amplify/graphql-transformer-core": {
-      "version": "0.17.7",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-0.17.7.tgz",
-      "integrity": "sha512-72eZ/EHlOgYtLUQGSfO0WjmKqFH9f0Sd4Apxkt2JmKXxFW8zxdaPiDWWKLFL3soMFcWTeCmpWAWXX03x3Kiwgg==",
+      "version": "0.17.11",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-0.17.11.tgz",
+      "integrity": "sha512-ErjsrZ9ZhZeLfFS9bqAQBxpIwF/p85KBc3iVvlEWj9WedEZrWWO0aQHSZuYjJ5ENl5yUCz0roamXeqdt6K3qsg==",
       "requires": {
-        "@aws-amplify/graphql-transformer-interfaces": "1.14.4",
+        "@aws-amplify/graphql-transformer-interfaces": "1.14.7",
         "@aws-cdk/aws-applicationautoscaling": "~1.124.0",
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-certificatemanager": "~1.124.0",
@@ -3826,9 +3848,9 @@
       }
     },
     "@aws-amplify/graphql-transformer-interfaces": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-1.14.4.tgz",
-      "integrity": "sha512-FXGeRQVSdRMg5j51bg7t9MbiJ7F2AB1CHC+U1AcH9wgWbVraWN4+yfaYjKbmQv1NB9p6BsSsQsDNDH7C9KSjuw==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-1.14.7.tgz",
+      "integrity": "sha512-UCpkRoYbt+GeZVnLSpasH96QZ0AOiZ59eXJWatMoRANMFbREytCP4xN/AyBV3MLEuWidAFpOXVB9e9TfLST5rQ==",
       "requires": {
         "@aws-cdk/aws-appsync": "~1.124.0",
         "@aws-cdk/aws-cloudwatch": "~1.124.0",
@@ -4602,14 +4624,14 @@
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
     "@types/node": {
-      "version": "16.11.43",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz",
-      "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ=="
+      "version": "16.11.56",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.56.tgz",
+      "integrity": "sha512-aFcUkv7EddxxOa/9f74DINReQ/celqH8DiB3fRYgVDM2Xm5QJL8sl80QKuAnGvwAsMn+H3IFA6WCrQh1CY7m1A=="
     },
     "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -4636,12 +4658,12 @@
       }
     },
     "amplify-cli-core": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/amplify-cli-core/-/amplify-cli-core-2.11.0.tgz",
-      "integrity": "sha512-oCq0k/cHY+tqE/izlNyK/kvy46HNCPCSqA1jJxItclkGfov8nUCy2PKpvwR1sSOVszu5/tpttP46XRBM7/sMHA==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/amplify-cli-core/-/amplify-cli-core-2.12.0.tgz",
+      "integrity": "sha512-X1Lba/1/HzjPu3RpIdGXjdYwufC7srsGc2jwn0VnGDz36+A5rht+fcHtI+hO4jr27EUTHu3te2EL2XeQxzniyg==",
       "requires": {
-        "@aws-amplify/graphql-transformer-core": "^0.17.6",
-        "@aws-amplify/graphql-transformer-interfaces": "^1.14.4",
+        "@aws-amplify/graphql-transformer-core": "^0.17.9",
+        "@aws-amplify/graphql-transformer-interfaces": "^1.14.6",
         "ajv": "^6.12.6",
         "amplify-cli-logger": "1.2.0",
         "amplify-prompts": "2.2.0",
@@ -4652,7 +4674,7 @@
         "execa": "^5.1.1",
         "fs-extra": "^8.1.0",
         "globby": "^11.0.3",
-        "graphql-transformer-core": "^7.6.2",
+        "graphql-transformer-core": "^7.6.5",
         "hjson": "^3.2.1",
         "js-yaml": "^4.0.0",
         "lodash": "^4.17.21",
@@ -4803,9 +4825,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="
     },
     "cli-width": {
       "version": "3.0.0",
@@ -4893,9 +4915,9 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "constructs": {
-      "version": "3.4.39",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-3.4.39.tgz",
-      "integrity": "sha512-tj2m8GUD155rwQXmfHMZvMtBwexTEU4m7rxVkNWSShl1bkhyYV8gVi8hrrG8MtSiizkz4FheYPlkU+O3YIEo/w=="
+      "version": "3.4.84",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-3.4.84.tgz",
+      "integrity": "sha512-qBkMW/Q6d0HYplW+EMP0Bbt2rjQVgCzG6lA55i2PUf/6RbxRmkxHipjBCoBzlOf9vcdEx/h3maxtJv0K8AeCIA=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -5258,9 +5280,9 @@
       }
     },
     "graphql-transformer-core": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/graphql-transformer-core/-/graphql-transformer-core-7.6.3.tgz",
-      "integrity": "sha512-ACBnFHd8tgSKGSXvskEd+ClulyjLFcUdw6QAoOX01bez8qpUV97Vo/PY0WG2TXaPzC599iEk8DDmCFhEXBUhkA==",
+      "version": "7.6.5",
+      "resolved": "https://registry.npmjs.org/graphql-transformer-core/-/graphql-transformer-core-7.6.5.tgz",
+      "integrity": "sha512-L+AzvLg7tHdmEJuHQchB188g5C4COKWvKGAUsC2qIEyPoTb9cfj5zD0aFjfC7tGD4fAnRbZ3pps2WqBX8887Sg==",
       "requires": {
         "cloudform-types": "^4.2.0",
         "deep-diff": "^1.0.2",
@@ -5602,9 +5624,9 @@
       }
     },
     "moment": {
-      "version": "2.29.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
-      "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     },
     "ms": {
       "version": "2.1.2",
@@ -5955,12 +5977,19 @@
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
     },
     "socks": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
-      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
+      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
       "requires": {
-        "ip": "^1.1.5",
+        "ip": "^2.0.0",
         "smart-buffer": "^4.2.0"
+      },
+      "dependencies": {
+        "ip": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+          "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+        }
       }
     },
     "socks-proxy-agent": {
@@ -6072,9 +6101,9 @@
       "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ=="
     },
     "ts-node": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.2.tgz",
-      "integrity": "sha512-LYdGnoGddf1D6v8REPtIH+5iq/gTDuZqv2/UJUU7tKjuEU8xVZorBM+buCGNjj+pGEud+sOoM4CX3/YzINpENA==",
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
       "requires": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -6110,9 +6139,9 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
     },
     "typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw=="
     },
     "typescript-json-schema": {
       "version": "0.52.0",
@@ -6169,9 +6198,9 @@
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
     },
     "vm2": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.10.tgz",
-      "integrity": "sha512-AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ==",
+      "version": "3.9.11",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz",
+      "integrity": "sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==",
       "requires": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -6342,9 +6371,9 @@
       }
     },
     "yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
     },
     "yn": {
       "version": "3.1.1",
diff --git a/amplify/backend/package.json b/amplify/backend/package.json
index 9a83e04d..f22adc1c 100644
--- a/amplify/backend/package.json
+++ b/amplify/backend/package.json
@@ -13,4 +13,4 @@
   "devDependencies": {
     "typescript": "^4.2.4"
   }
-}
\ No newline at end of file
+}
diff --git a/amplify/generated/models/Pet.swift b/amplify/generated/models/Pet.swift
index 111d240f..476d28f8 100644
--- a/amplify/generated/models/Pet.swift
+++ b/amplify/generated/models/Pet.swift
@@ -65,4 +65,4 @@ public struct Pet: Model {
       self.users = users
       self.petCategoryId = petCategoryId
   }
-}
\ No newline at end of file
+}
diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json
index a5a6ab5e..71a57a14 100644
--- a/amplify/team-provider-info.json
+++ b/amplify/team-provider-info.json
@@ -1,41 +1,41 @@
 {
-  "dev": {
-    "awscloudformation": {
-      "AuthRoleName": "amplify-animeal-dev-171201-authRole",
-      "UnauthRoleArn": "arn:aws:iam::027735239009:role/amplify-animeal-dev-171201-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::027735239009:role/amplify-animeal-dev-171201-authRole",
-      "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-animeal-dev-171201-deployment",
-      "UnauthRoleName": "amplify-animeal-dev-171201-unauthRole",
-      "StackName": "amplify-animeal-dev-171201",
-      "StackId": "arn:aws:cloudformation:us-east-1:027735239009:stack/amplify-animeal-dev-171201/aa198700-d2c6-11ec-9434-0eefc3705b7f",
-      "AmplifyAppId": "d3uobbjnmsxou"
-    },
-    "categories": {
-      "auth": {
-        "animeald4b890d7": {},
-        "userPoolGroups": {}
-      },
-      "function": {
-        "AdminQueries9b7a2344": {
-          "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
-          "s3Key": "amplify-builds/AdminQueries9b7a2344-586269547878306b664c-build.zip"
+    "dev": {
+        "awscloudformation": {
+            "AuthRoleName": "amplify-animeal-dev-171201-authRole",
+            "UnauthRoleArn": "arn:aws:iam::027735239009:role/amplify-animeal-dev-171201-unauthRole",
+            "AuthRoleArn": "arn:aws:iam::027735239009:role/amplify-animeal-dev-171201-authRole",
+            "Region": "us-east-1",
+            "DeploymentBucketName": "amplify-animeal-dev-171201-deployment",
+            "UnauthRoleName": "amplify-animeal-dev-171201-unauthRole",
+            "StackName": "amplify-animeal-dev-171201",
+            "StackId": "arn:aws:cloudformation:us-east-1:027735239009:stack/amplify-animeal-dev-171201/aa198700-d2c6-11ec-9434-0eefc3705b7f",
+            "AmplifyAppId": "d3uobbjnmsxou"
         },
-        "translate": {
-          "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
-          "s3Key": "amplify-builds/translate-6c38346c566e38616e58-build.zip"
-        },
-        "updateTranslationsTrigger": {
-          "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
-          "s3Key": "amplify-builds/updateTranslationsTrigger-35492f486a6f65783065-build.zip"
-        }
-      },
-      "hosting": {
-        "amplifyhosting": {
-          "appId": "d3uobbjnmsxou",
-          "type": "cicd"
+        "categories": {
+            "auth": {
+                "animeald4b890d7": {},
+                "userPoolGroups": {}
+            },
+            "function": {
+                "AdminQueries9b7a2344": {
+                    "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
+                    "s3Key": "amplify-builds/AdminQueries9b7a2344-586269547878306b664c-build.zip"
+                },
+                "translate": {
+                    "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
+                    "s3Key": "amplify-builds/translate-6c38346c566e38616e58-build.zip"
+                },
+                "updateTranslationsTrigger": {
+                    "deploymentBucketName": "amplify-animeal-dev-171201-deployment",
+                    "s3Key": "amplify-builds/updateTranslationsTrigger-35492f486a6f65783065-build.zip"
+                }
+            },
+            "hosting": {
+                "amplifyhosting": {
+                    "appId": "d3uobbjnmsxou",
+                    "type": "cicd"
+                }
+            }
         }
-      }
     }
-  }
 }
\ No newline at end of file
diff --git a/animeal.xcodeproj/project.pbxproj b/animeal.xcodeproj/project.pbxproj
index 6699e57e..b045e1ce 100644
--- a/animeal.xcodeproj/project.pbxproj
+++ b/animeal.xcodeproj/project.pbxproj
@@ -58,11 +58,6 @@
 		838B6B702868B039001DD111 /* VerificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 838B6B6F2868B039001DD111 /* VerificationModel.swift */; };
 		838B6B732868B052001DD111 /* VerificationContract.swift in Sources */ = {isa = PBXBuildFile; fileRef = 838B6B722868B052001DD111 /* VerificationContract.swift */; };
 		838B6B752868B061001DD111 /* VerificationAssembler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 838B6B742868B061001DD111 /* VerificationAssembler.swift */; };
-		839E2742284A33490040142A /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 839E2741284A33490040142A /* AWSAPIPlugin */; };
-		839E2744284A33490040142A /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 839E2743284A33490040142A /* AWSCognitoAuthPlugin */; };
-		839E2746284A33490040142A /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 839E2745284A33490040142A /* AWSDataStorePlugin */; };
-		839E2748284A33490040142A /* AWSLocationGeoPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 839E2747284A33490040142A /* AWSLocationGeoPlugin */; };
-		839E274A284A33490040142A /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 839E2749284A33490040142A /* Amplify */; };
 		83C24F70286D99280086330B /* LoginViewActionMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C24F6B286D99280086330B /* LoginViewActionMapper.swift */; };
 		83C24F71286D99280086330B /* LoginViewOnboardingStepsMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C24F6C286D99280086330B /* LoginViewOnboardingStepsMapper.swift */; };
 		83C24F72286D99280086330B /* LoginViewAction+ButtonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C24F6E286D99280086330B /* LoginViewAction+ButtonViewModel.swift */; };
@@ -132,6 +127,14 @@
 		DB6B07CA28450A380009397B /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6B07C928450A380009397B /* HomeViewController.swift */; };
 		DB6B07D228450A390009397B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DB6B07D028450A390009397B /* LaunchScreen.storyboard */; };
 		DBA3C7E728575CAF00B30A78 /* MapboxMaps in Frameworks */ = {isa = PBXBuildFile; productRef = DBA3C7E628575CAF00B30A78 /* MapboxMaps */; };
+		DBBABB1F28BF51250052E91C /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB1E28BF51250052E91C /* AWSAPIPlugin */; };
+		DBBABB2128BF51250052E91C /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2028BF51250052E91C /* AWSCognitoAuthPlugin */; };
+		DBBABB2328BF51250052E91C /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2228BF51250052E91C /* AWSDataStorePlugin */; };
+		DBBABB2528BF51250052E91C /* AWSLocationGeoPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2428BF51250052E91C /* AWSLocationGeoPlugin */; };
+		DBBABB2728BF51250052E91C /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2628BF51250052E91C /* AWSPinpointAnalyticsPlugin */; };
+		DBBABB2928BF51250052E91C /* AWSPluginsCore in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2828BF51250052E91C /* AWSPluginsCore */; };
+		DBBABB2B28BF51250052E91C /* AWSS3StoragePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2A28BF51250052E91C /* AWSS3StoragePlugin */; };
+		DBBABB2D28BF51250052E91C /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = DBBABB2C28BF51250052E91C /* Amplify */; };
 		DBBDE72A28BB8C2A006EEBA3 /* MoreItemViewMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBBDE72928BB8C2A006EEBA3 /* MoreItemViewMapper.swift */; };
 		DBDB50182887FBBA003C6FF0 /* HomeContract.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBDB50172887FBBA003C6FF0 /* HomeContract.swift */; };
 		DBDB501B2887FE00003C6FF0 /* HomeModel+DTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBDB501A2887FE00003C6FF0 /* HomeModel+DTO.swift */; };
@@ -333,15 +336,18 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DBBABB1F28BF51250052E91C /* AWSAPIPlugin in Frameworks */,
 				FBCAE51C28687467008E3AC7 /* UIComponents in Frameworks */,
-				839E2742284A33490040142A /* AWSAPIPlugin in Frameworks */,
-				839E2748284A33490040142A /* AWSLocationGeoPlugin in Frameworks */,
+				DBBABB2528BF51250052E91C /* AWSLocationGeoPlugin in Frameworks */,
 				DBA3C7E728575CAF00B30A78 /* MapboxMaps in Frameworks */,
-				839E274A284A33490040142A /* Amplify in Frameworks */,
+				DBBABB2928BF51250052E91C /* AWSPluginsCore in Frameworks */,
+				DBBABB2728BF51250052E91C /* AWSPinpointAnalyticsPlugin in Frameworks */,
+				DBBABB2B28BF51250052E91C /* AWSS3StoragePlugin in Frameworks */,
 				FBE4295E287442B800D1BD26 /* Common in Frameworks */,
-				839E2744284A33490040142A /* AWSCognitoAuthPlugin in Frameworks */,
-				839E2746284A33490040142A /* AWSDataStorePlugin in Frameworks */,
 				FBCAE51D28687467008E3AC7 /* Services in Frameworks */,
+				DBBABB2D28BF51250052E91C /* Amplify in Frameworks */,
+				DBBABB2128BF51250052E91C /* AWSCognitoAuthPlugin in Frameworks */,
+				DBBABB2328BF51250052E91C /* AWSDataStorePlugin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1048,14 +1054,17 @@
 			name = animeal;
 			packageProductDependencies = (
 				FB5E4A3E284770FE00679657 /* UIComponents */,
-				839E2741284A33490040142A /* AWSAPIPlugin */,
-				839E2743284A33490040142A /* AWSCognitoAuthPlugin */,
-				839E2745284A33490040142A /* AWSDataStorePlugin */,
-				839E2747284A33490040142A /* AWSLocationGeoPlugin */,
-				839E2749284A33490040142A /* Amplify */,
 				FB2914DB284F66830094DA8B /* Services */,
 				DBA3C7E628575CAF00B30A78 /* MapboxMaps */,
 				FBE4295D287442B800D1BD26 /* Common */,
+				DBBABB1E28BF51250052E91C /* AWSAPIPlugin */,
+				DBBABB2028BF51250052E91C /* AWSCognitoAuthPlugin */,
+				DBBABB2228BF51250052E91C /* AWSDataStorePlugin */,
+				DBBABB2428BF51250052E91C /* AWSLocationGeoPlugin */,
+				DBBABB2628BF51250052E91C /* AWSPinpointAnalyticsPlugin */,
+				DBBABB2828BF51250052E91C /* AWSPluginsCore */,
+				DBBABB2A28BF51250052E91C /* AWSS3StoragePlugin */,
+				DBBABB2C28BF51250052E91C /* Amplify */,
 			);
 			productName = animeal;
 			productReference = DB6B07C228450A380009397B /* animeal.app */;
@@ -1138,10 +1147,10 @@
 			);
 			mainGroup = DB6B07B928450A380009397B;
 			packageReferences = (
-				839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */,
 				FBFE40EE2853448800316D58 /* XCRemoteSwiftPackageReference "Quick" */,
 				FBFE40F1285344B100316D58 /* XCRemoteSwiftPackageReference "Nimble" */,
 				DBA3C7E528575CAF00B30A78 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */,
+				DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */,
 			);
 			productRefGroup = DB6B07C328450A380009397B /* Products */;
 			projectDirPath = "";
@@ -1818,20 +1827,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */ = {
+		DBA3C7E528575CAF00B30A78 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/aws-amplify/amplify-ios";
+			repositoryURL = "https://github.com/mapbox/mapbox-maps-ios.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				minimumVersion = 10.5.0;
 			};
 		};
-		DBA3C7E528575CAF00B30A78 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */ = {
+		DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/mapbox/mapbox-maps-ios.git";
+			repositoryURL = "https://github.com/ihartsimafeichyk/amplify-ios";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 10.5.0;
+				branch = "fix/has-one-association";
+				kind = branch;
 			};
 		};
 		FBFE40EE2853448800316D58 /* XCRemoteSwiftPackageReference "Quick" */ = {
@@ -1853,35 +1862,50 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		839E2741284A33490040142A /* AWSAPIPlugin */ = {
+		DBA3C7E628575CAF00B30A78 /* MapboxMaps */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = DBA3C7E528575CAF00B30A78 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
+			productName = MapboxMaps;
+		};
+		DBBABB1E28BF51250052E91C /* AWSAPIPlugin */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
 			productName = AWSAPIPlugin;
 		};
-		839E2743284A33490040142A /* AWSCognitoAuthPlugin */ = {
+		DBBABB2028BF51250052E91C /* AWSCognitoAuthPlugin */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
 			productName = AWSCognitoAuthPlugin;
 		};
-		839E2745284A33490040142A /* AWSDataStorePlugin */ = {
+		DBBABB2228BF51250052E91C /* AWSDataStorePlugin */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
 			productName = AWSDataStorePlugin;
 		};
-		839E2747284A33490040142A /* AWSLocationGeoPlugin */ = {
+		DBBABB2428BF51250052E91C /* AWSLocationGeoPlugin */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
 			productName = AWSLocationGeoPlugin;
 		};
-		839E2749284A33490040142A /* Amplify */ = {
+		DBBABB2628BF51250052E91C /* AWSPinpointAnalyticsPlugin */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 839E2740284A33490040142A /* XCRemoteSwiftPackageReference "amplify-ios" */;
-			productName = Amplify;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			productName = AWSPinpointAnalyticsPlugin;
 		};
-		DBA3C7E628575CAF00B30A78 /* MapboxMaps */ = {
+		DBBABB2828BF51250052E91C /* AWSPluginsCore */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBA3C7E528575CAF00B30A78 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
-			productName = MapboxMaps;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			productName = AWSPluginsCore;
+		};
+		DBBABB2A28BF51250052E91C /* AWSS3StoragePlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			productName = AWSS3StoragePlugin;
+		};
+		DBBABB2C28BF51250052E91C /* Amplify */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = DBBABB1D28BF51250052E91C /* XCRemoteSwiftPackageReference "amplify-ios" */;
+			productName = Amplify;
 		};
 		FB2914DB284F66830094DA8B /* Services */ = {
 			isa = XCSwiftPackageProductDependency;
diff --git a/animeal.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/animeal.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7b2c1b43..049a9299 100644
--- a/animeal.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/animeal.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -12,10 +12,10 @@
     {
       "identity" : "amplify-ios",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/aws-amplify/amplify-ios",
+      "location" : "https://github.com/ihartsimafeichyk/amplify-ios",
       "state" : {
-        "revision" : "b10b7e4fe5f36b95f4aa5904c47ee962071d9895",
-        "version" : "1.26.2"
+        "branch" : "fix/has-one-association",
+        "revision" : "6f2f1cb3cb809ecd36f84fd0833eaafd677ab783"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "443e35abb0646fb685e0754db74249d3242625ab",
-        "version" : "2.27.10"
+        "revision" : "e2228349798d289aa728dc489388d242214ba869",
+        "version" : "2.27.15"
       }
     },
     {
@@ -212,8 +212,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stephencelis/SQLite.swift.git",
       "state" : {
-        "revision" : "5f5ad81ac0d0a0f3e56e39e646e8423c617df523",
-        "version" : "0.13.2"
+        "revision" : "0a9893ec030501a3956bee572d6b4fdd3ae158a1",
+        "version" : "0.12.2"
       }
     },
     {