diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 00000000..f6c1a6d1
--- /dev/null
+++ b/.prettierrc.yml
@@ -0,0 +1,7 @@
+trailingComma: "es5"
+semi: true
+printWidth: 120
+tabWidth: 4
+singleQuote: true
+arrowParens: "always"
+jsxSingleQuote: true
\ No newline at end of file
diff --git a/packages/plugin-aws-sdk/package.json b/packages/plugin-aws-sdk/package.json
index 61b6881b..695e204f 100644
--- a/packages/plugin-aws-sdk/package.json
+++ b/packages/plugin-aws-sdk/package.json
@@ -31,20 +31,21 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "devDependencies": {
-        "@opentelemetry/node": "^0.9.0",
-        "@opentelemetry/tracing": "^0.9.0",
-        "@types/jest": "^25.2.3",
+        "@opentelemetry/node": "^0.12.0",
+        "@opentelemetry/tracing": "^0.12.0",
+        "@types/jest": "^26.0.15",
         "@types/shimmer": "^1.0.1",
-        "aws-sdk": "^2.694.0",
-        "husky": "^4.2.5",
-        "jest": "^26.0.1",
-        "lint-staged": "^10.2.9",
-        "prettier": "2.0.5",
-        "ts-jest": "^26.1.0",
-        "typescript": "^3.9.5"
+        "aws-sdk": "^2.780.0",
+        "husky": "^4.3.0",
+        "jest": "^26.6.1",
+        "lint-staged": "^10.5.0",
+        "prettier": "2.1.2",
+        "ts-jest": "^26.4.3",
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@opentelemetry/core": "^0.9.0",
+        "@opentelemetry/api": "^0.12.0",
+        "@opentelemetry/core": "^0.12.0",
         "shimmer": "^1.2.1"
     },
     "jest": {
diff --git a/packages/plugin-aws-sdk/src/services/sqs.ts b/packages/plugin-aws-sdk/src/services/sqs.ts
index 6b334ea3..d2d7af77 100644
--- a/packages/plugin-aws-sdk/src/services/sqs.ts
+++ b/packages/plugin-aws-sdk/src/services/sqs.ts
@@ -1,7 +1,7 @@
-import { Tracer, SpanKind, Span, propagation, Context, Link, Logger } from '@opentelemetry/api';
+import { Tracer, SpanKind, Span, propagation, Context, Link, Logger, getActiveSpan } from '@opentelemetry/api';
 import { RequestMetadata, ServiceExtension } from './ServiceExtension';
 import * as AWS from 'aws-sdk';
-import { getExtractedSpanContext, TRACE_PARENT_HEADER } from '@opentelemetry/core';
+import { TRACE_PARENT_HEADER, TRACE_STATE_HEADER } from '@opentelemetry/core';
 import {
     MessageBodyAttributeMap,
     SendMessageRequest,
@@ -72,6 +72,7 @@ export class SqsServiceExtension implements ServiceExtension {
                     const params: Record<string, any> = (request as any).params;
                     const attributesNames = params.MessageAttributeNames || [];
                     attributesNames.push(TRACE_PARENT_HEADER);
+                    attributesNames.push(TRACE_STATE_HEADER);
                     params.MessageAttributeNames = attributesNames;
                 }
                 break;
@@ -168,9 +169,10 @@ export class SqsServiceExtension implements ServiceExtension {
         propagtedContext: Context
     ): Span {
         const links: Link[] = [];
-        if (propagtedContext) {
+        const spanContext = getActiveSpan(propagtedContext)?.context();
+        if (spanContext) {
             links.push({
-                context: getExtractedSpanContext(propagtedContext),
+                context: spanContext,
             } as Link);
         }