diff --git a/package-lock.json b/package-lock.json
index e7c93e9..39bdf39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,14 +25,14 @@
       "devDependencies": {
         "@types/aws-lambda": "^8.10.86",
         "@types/jest": "^26.0.10",
-        "@types/node": "^10.17.27",
+        "@types/node": "^16.18.0",
         "aws-cdk-lib": "^2.80.0",
         "constructs": "^10.0.0",
         "esbuild": "^0.14.49",
         "jest": "^29.7.0",
         "ts-jest": "^29.2.3",
-        "ts-node": "^9.0.0",
-        "typescript": "~3.9.7"
+        "ts-node": "^10.9.1",
+        "typescript": "~4.9.5"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1378,6 +1378,30 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
     "node_modules/@esbuild/linux-loong64": {
       "version": "0.14.54",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
@@ -2342,6 +2366,34 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/aws-lambda": {
       "version": "8.10.142",
       "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.142.tgz",
@@ -2441,9 +2493,10 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "10.17.60",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
-      "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="
+      "version": "16.18.125",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.125.tgz",
+      "integrity": "sha512-w7U5ojboSPfZP4zD98d+/cjcN2BDW6lKH2M0ubipt8L8vUC7qUAC6ENKGSJL4tEktH2Saw2K4y1uwSjyRGKMhw==",
+      "license": "MIT"
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
@@ -2466,6 +2519,32 @@
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "dev": true
     },
+    "node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -6123,29 +6202,47 @@
       }
     },
     "node_modules/ts-node": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
-      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
         "arg": "^4.1.0",
         "create-require": "^1.1.0",
         "diff": "^4.0.1",
         "make-error": "^1.1.1",
-        "source-map-support": "^0.5.17",
+        "v8-compile-cache-lib": "^3.0.1",
         "yn": "3.1.1"
       },
       "bin": {
         "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
         "ts-node-script": "dist/bin-script.js",
         "ts-node-transpile-only": "dist/bin-transpile.js",
         "ts-script": "dist/bin-script-deprecated.js"
       },
-      "engines": {
-        "node": ">=10.0.0"
-      },
       "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
         "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
       }
     },
     "node_modules/tslib": {
@@ -6175,10 +6272,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6229,6 +6327,13 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
diff --git a/package.json b/package.json
index cf08ac5..ea8291b 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,14 @@
   "devDependencies": {
     "@types/aws-lambda": "^8.10.86",
     "@types/jest": "^26.0.10",
-    "@types/node": "^10.17.27",
+    "@types/node": "^16.18.0",
     "aws-cdk-lib": "^2.80.0",
     "constructs": "^10.0.0",
     "esbuild": "^0.14.49",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.3",
-    "ts-node": "^9.0.0",
-    "typescript": "~3.9.7"
+    "ts-node": "^10.9.1",
+    "typescript": "~4.9.5"
   },
   "dependencies": {
     "@aws-lambda-powertools/logger": "^1.0.1",
diff --git a/src/api/delete-product.ts b/src/api/delete-product.ts
index 6b410a0..182295c 100644
--- a/src/api/delete-product.ts
+++ b/src/api/delete-product.ts
@@ -41,8 +41,10 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ message: "Product deleted" }),
     };
-  } catch (error) {
-    logger.error('Unexpected error occurred while trying to delete product with ID '+ id, error);
+  } catch (error: unknown) {
+    logger.error(`Unexpected error occurred while trying to delete product with ID ${id}`, {
+      error: error instanceof Error ? error.message : String(error)
+    });
 
     return {
       statusCode: 500,
@@ -59,4 +61,4 @@ const handler = middy(lambdaHandler)
 
 export {
   handler
-};
\ No newline at end of file
+};
diff --git a/src/api/get-product.ts b/src/api/get-product.ts
index 6216e7f..037fe97 100644
--- a/src/api/get-product.ts
+++ b/src/api/get-product.ts
@@ -50,8 +50,10 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
       headers: { "content-type": "application/json" },
       body: JSON.stringify(result),
     };
-  } catch (error) {
-    logger.error('Unexpected error occurred while trying to retrieve a product', error);
+  } catch (error: unknown) {
+    logger.error('Unexpected error occurred while trying to retrieve a product', {
+      error: error instanceof Error ? error.message : String(error)
+    });
 
     return {
       statusCode: 500,
@@ -68,4 +70,4 @@ const handler = middy(lambdaHandler)
 
 export {
   handler
-};
\ No newline at end of file
+};
diff --git a/src/api/get-products.ts b/src/api/get-products.ts
index ee30253..75f8fb8 100644
--- a/src/api/get-products.ts
+++ b/src/api/get-products.ts
@@ -28,8 +28,10 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
       headers: { "content-type": "application/json" },
       body: `{"products":${JSON.stringify(result)}}`,
     };
-  } catch (error) {
-      logger.error('Unexpected error occurred while trying to retrieve products', error as Error);
+  } catch (error: unknown) {
+          logger.error('Unexpected error occurred while trying to retrieve a product', {
+      error: error instanceof Error ? error.message : String(error)
+    });
 
       return {
         statusCode: 500,
@@ -46,4 +48,4 @@ const handler = middy(lambdaHandler)
 
 export {
   handler
-};
\ No newline at end of file
+};
diff --git a/src/api/put-product.ts b/src/api/put-product.ts
index dd8bc34..63db189 100644
--- a/src/api/put-product.ts
+++ b/src/api/put-product.ts
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
-import { Product } from "../model/product";
+import { Product } from "../model/Product";
 import { DynamoDbStore } from "../store/dynamodb/dynamodb-store";
 import { ProductStore } from "../store/product-store";
 import { captureLambdaHandler } from '@aws-lambda-powertools/tracer';
@@ -48,7 +48,9 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
       throw Error("Parsed product is not an object")
     }
   } catch (error) {
-    logger.error('Unexpected error occurred while trying to create a product', error);
+    logger.error('Unexpected error occurred while trying to create a product', {
+      error: error instanceof Error ? error.message : String(error)
+    });
 
     return {
       statusCode: 400,
@@ -82,9 +84,10 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ message: "Product created" }),
     };
-  } catch (error) {
-    logger.error('Unexpected error occurred while trying to create a product', error);
-
+  } catch (error: unknown) {
+    logger.error('Unexpected error occurred while trying to create a product', {
+      error: error instanceof Error ? error.message : String(error)
+    });
     return {
       statusCode: 500,
       headers: { "content-type": "application/json" },
@@ -100,4 +103,4 @@ const handler = middy(lambdaHandler)
 
 export {
   handler
-};
\ No newline at end of file
+};
diff --git a/src/store/product-store.ts b/src/store/product-store.ts
index d115302..f3119ac 100644
--- a/src/store/product-store.ts
+++ b/src/store/product-store.ts
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
-import { Product } from "../model/product";
+import { Product } from "../model/Product";
 
 export interface ProductStore {
   getProduct: (id: string) => Promise<Product | undefined>;
diff --git a/tsconfig.json b/tsconfig.json
index 9f8e8be..3269966 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,8 @@
     "target": "ES2018",
     "module": "commonjs",
     "lib": [
-      "es2018"
+      "ES2018",
+      "DOM"
     ],
     "declaration": true,
     "strict": true,
@@ -21,10 +22,14 @@
     "strictPropertyInitialization": false,
     "typeRoots": [
       "./node_modules/@types"
-    ]
+    ],    
+    "outDir": "dist",
+    "forceConsistentCasingInFileNames": true,
+    "rootDir": "."
   },
   "exclude": [
     "node_modules",
-    "cdk.out"
+    "cdk.out",
+    "dist"
   ]
 }