diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index 23af2cd9a2ee9205062f679fe2c7ec790e1eeacd..ffdf759c7327d6c726c237e0c3ac56fcb5d61829 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -296,7 +296,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                     i18n.changeLanguage(this.lang);
                     break;
                 case "entryPointUrl":
-                    JSONLD.initialize(this.entryPointUrl, (jsonld) => {
+                    JSONLD.getInstance(this.entryPointUrl).then((jsonld) => {
                         let apiUrlBase = jsonld.getApiUrlForEntityName("AdvancedlySignedDocument");
                         this.fileSourceUrl = apiUrlBase;
                     });
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 64a324c5ced8fd571a0246651446c1372704fd2d..f6e3573abda36a01f1cfb7f04959b030245c74f9 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -314,7 +314,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
         const fileName = this.currentFileName === "" ? "mydoc.pdf" : this.currentFileName;
 
         // fetch pdf from api gateway with sessionId
-        JSONLD.initialize(this.entryPointUrl, (jsonld) => {
+        JSONLD.getInstance(this.entryPointUrl).then((jsonld) => {
             const apiUrl = jsonld.getApiUrlForEntityName("QualifiedlySignedDocument") + '/' + encodeURIComponent(sessionId) + '?fileName=' +
                 encodeURIComponent(fileName);
 
@@ -417,7 +417,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                     i18n.changeLanguage(this.lang);
                     break;
                 case "entryPointUrl":
-                    JSONLD.initialize(this.entryPointUrl, (jsonld) => {
+                    JSONLD.getInstance(this.entryPointUrl).then((jsonld) => {
                         const apiUrlBase = jsonld.getApiUrlForEntityName("QualifiedSigningRequest");
                         this.fileSourceUrl = apiUrlBase ;
                     });
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index 60b0c0a1564f3f50d76b563b53a568f2f572713d..12c091f78752be6749189b112b4aba887542198c 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -39,7 +39,6 @@ export class DBPSignatureBaseLitElement extends AdapterLitElement {
         changedProperties.forEach((oldValue, propName) => {
             switch (propName) {
                 case "auth":
-                    JSONLD.doInitializationOnce(this.entryPointUrl, this.auth.token);
                     this._updateAuth();
                     break;
             }
diff --git a/src/dbp-signature-verification-full.js b/src/dbp-signature-verification-full.js
index 04de3b707422a2247bc63198a1b9a9568cffcf94..674cecbbc10371be37d03ac250111c1524b24de3 100644
--- a/src/dbp-signature-verification-full.js
+++ b/src/dbp-signature-verification-full.js
@@ -209,7 +209,7 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
                     i18n.changeLanguage(this.lang);
                     break;
                 case "entryPointUrl":
-                    JSONLD.initialize(this.entryPointUrl, (jsonld) => {
+                    JSONLD.getInstance(this.entryPointUrl).then((jsonld) => {
                         const apiUrlBase = jsonld.getApiUrlForEntityName("ElectronicSignatureVerificationReport");
                         this.fileSourceUrl = apiUrlBase;
                     });
diff --git a/vendor/toolkit b/vendor/toolkit
index e728b2a0094aaa18cecc3b081238f8e189871c35..a8ab1f7220f86eea76e5f601c080da066496f7df 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit e728b2a0094aaa18cecc3b081238f8e189871c35
+Subproject commit a8ab1f7220f86eea76e5f601c080da066496f7df