diff --git a/dist/index.d.ts b/dist/index.d.ts
index c0561bd..575f91b 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -12,6 +12,13 @@ export interface Constructor {
     submission: (response: any) => void;
     settings?: Settings;
 }
+export interface Address {
+    address?: string;
+    city?: string;
+    state?: string;
+    zip?: string;
+    country?: string;
+}
 export interface GuardianData {
     events: Record<string, unknown>[];
     session_id: string;
@@ -46,6 +53,8 @@ export default class Tokenizer {
     submit(amount?: string): void;
     setExpDate(expDate: string): void;
     setError(input: string): void;
+    setBilling(address: Address): void;
+    setShipping(address: Address): void;
     postMessage(msg: Message): void;
     onLoad: () => void;
     validCard: (card: any) => void;
diff --git a/dist/tokenizer.amd.js b/dist/tokenizer.amd.js
index a390f4a..86703f3 100644
--- a/dist/tokenizer.amd.js
+++ b/dist/tokenizer.amd.js
@@ -1 +1 @@
-define("Tokenizer",[],(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function r(t){try{p(i.next(t))}catch(t){o(t)}}function s(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(r,s)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,r={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(p){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(r=0)),r;)try{if(n=1,i&&(a=2&s[0]?i.return:s[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,s[1])).done)return a;switch(i=0,a&&(s=[2&s[0],a.value]),s[0]){case 0:case 1:a=s;break;case 4:return r.label++,{value:s[1],done:!1};case 5:r.label++,i=s[1],s=[0];continue;case 7:s=r.ops.pop(),r.trys.pop();continue;default:if(!((a=(a=r.trys).length>0&&a[a.length-1])||6!==s[0]&&2!==s[0])){r=0;continue}if(3===s[0]&&(!a||s[1]>a[0]&&s[1]<a[3])){r.label=s[1];break}if(6===s[0]&&r.label<a[1]){r.label=a[1],a=s;break}if(a&&r.label<a[2]){r.label=a[2],r.ops.push(s);break}a[2]&&r.ops.pop(),r.trys.pop();continue}s=e.call(t,r)}catch(t){s=[6,t],i=0}finally{n=a=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a="/api/tokenizer",o=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var r=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});r.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return r.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),r.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},r.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?r.completePayment(ApplePaySession.STATUS_SUCCESS):r.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){r.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{r.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){var t=this.url;return window.location.href.includes("localhost")?"http://localhost:8082".replace(/\/$/,"")+a:t.replace(/\/$/,"")+a},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){document.head.insertAdjacentHTML("beforeend","\n    <style>\n      apple-pay-button {\n          --apple-pay-button-width: 100%;\n          --apple-pay-button-height: 20px;\n          border-radius: 4px;\n          border: solid 1px #DCDEE2;\n      }\n    </style>\n    ");var r=document.createElement("script");r.setAttribute("src","https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js"),r.setAttribute("async",""),r.setAttribute("crossorigin",""),document.head.appendChild(r),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=o}}[658](0,t),t.default}()}));
\ No newline at end of file
+define("Tokenizer",[],(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function s(t){try{p(i.next(t))}catch(t){o(t)}}function r(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(s,r)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,s={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function r(r){return function(p){return function(r){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,r[0]&&(s=0)),s;)try{if(n=1,i&&(a=2&r[0]?i.return:r[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,r[1])).done)return a;switch(i=0,a&&(r=[2&r[0],a.value]),r[0]){case 0:case 1:a=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,i=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!((a=(a=s.trys).length>0&&a[a.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!a||r[1]>a[0]&&r[1]<a[3])){s.label=r[1];break}if(6===r[0]&&s.label<a[1]){s.label=a[1],a=r;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(r);break}a[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],i=0}finally{n=a=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var s=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});s.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return s.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),s.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},s.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?s.completePayment(ApplePaySession.STATUS_SUCCESS):s.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){s.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{s.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");if(!t.apikey.startsWith("pub_"))throw new Error("apikey must be a public apikey and must start with pub_");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){var t;e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,"string"==typeof(null===(t=e.settings.payment)||void 0===t?void 0:t.types)&&(e.settings.payment.types=[e.settings.payment.types],e.settings.payment.forcePaymentSelection=!0),e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){return this.url.replace(/\/$/,"")+"/api/tokenizer"},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){var s=document.createElement("script");s.setAttribute("src","https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"),s.setAttribute("async",""),s.setAttribute("crossorigin",""),document.head.appendChild(s),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.style.setProperty("--apple-pay-button-width","100%"),this.applePay.btn.style.setProperty("--apple-pay-button-height","20px"),this.applePay.btn.style.borderRadius="4px",this.applePay.btn.style.border="solid 1px #DCDEE2",this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.setBilling=function(t){this.postMessage({event:"setBilling",data:t})},t.prototype.setShipping=function(t){this.postMessage({event:"setShipping",data:t})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=a}}[658](0,t),t.default}()}));
\ No newline at end of file
diff --git a/dist/tokenizer.commonjs2.js b/dist/tokenizer.commonjs2.js
index 37b6776..46e65c9 100644
--- a/dist/tokenizer.commonjs2.js
+++ b/dist/tokenizer.commonjs2.js
@@ -1 +1 @@
-!function(){"use strict";var t={};({658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function r(t){try{p(i.next(t))}catch(t){o(t)}}function s(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(r,s)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,r={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(p){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(r=0)),r;)try{if(n=1,i&&(a=2&s[0]?i.return:s[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,s[1])).done)return a;switch(i=0,a&&(s=[2&s[0],a.value]),s[0]){case 0:case 1:a=s;break;case 4:return r.label++,{value:s[1],done:!1};case 5:r.label++,i=s[1],s=[0];continue;case 7:s=r.ops.pop(),r.trys.pop();continue;default:if(!((a=(a=r.trys).length>0&&a[a.length-1])||6!==s[0]&&2!==s[0])){r=0;continue}if(3===s[0]&&(!a||s[1]>a[0]&&s[1]<a[3])){r.label=s[1];break}if(6===s[0]&&r.label<a[1]){r.label=a[1],a=s;break}if(a&&r.label<a[2]){r.label=a[2],r.ops.push(s);break}a[2]&&r.ops.pop(),r.trys.pop();continue}s=e.call(t,r)}catch(t){s=[6,t],i=0}finally{n=a=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a="/api/tokenizer",o=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var r=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});r.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return r.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),r.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},r.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?r.completePayment(ApplePaySession.STATUS_SUCCESS):r.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){r.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{r.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){var t=this.url;return window.location.href.includes("localhost")?"http://localhost:8082".replace(/\/$/,"")+a:t.replace(/\/$/,"")+a},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){document.head.insertAdjacentHTML("beforeend","\n    <style>\n      apple-pay-button {\n          --apple-pay-button-width: 100%;\n          --apple-pay-button-height: 20px;\n          border-radius: 4px;\n          border: solid 1px #DCDEE2;\n      }\n    </style>\n    ");var r=document.createElement("script");r.setAttribute("src","https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js"),r.setAttribute("async",""),r.setAttribute("crossorigin",""),document.head.appendChild(r),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=o}})[658](0,t),module.exports.Tokenizer=t.default}();
\ No newline at end of file
+!function(){"use strict";var t={};({658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function s(t){try{p(i.next(t))}catch(t){o(t)}}function r(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(s,r)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,s={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function r(r){return function(p){return function(r){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,r[0]&&(s=0)),s;)try{if(n=1,i&&(a=2&r[0]?i.return:r[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,r[1])).done)return a;switch(i=0,a&&(r=[2&r[0],a.value]),r[0]){case 0:case 1:a=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,i=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!((a=(a=s.trys).length>0&&a[a.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!a||r[1]>a[0]&&r[1]<a[3])){s.label=r[1];break}if(6===r[0]&&s.label<a[1]){s.label=a[1],a=r;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(r);break}a[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],i=0}finally{n=a=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var s=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});s.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return s.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),s.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},s.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?s.completePayment(ApplePaySession.STATUS_SUCCESS):s.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){s.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{s.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");if(!t.apikey.startsWith("pub_"))throw new Error("apikey must be a public apikey and must start with pub_");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){var t;e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,"string"==typeof(null===(t=e.settings.payment)||void 0===t?void 0:t.types)&&(e.settings.payment.types=[e.settings.payment.types],e.settings.payment.forcePaymentSelection=!0),e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){return this.url.replace(/\/$/,"")+"/api/tokenizer"},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){var s=document.createElement("script");s.setAttribute("src","https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"),s.setAttribute("async",""),s.setAttribute("crossorigin",""),document.head.appendChild(s),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.style.setProperty("--apple-pay-button-width","100%"),this.applePay.btn.style.setProperty("--apple-pay-button-height","20px"),this.applePay.btn.style.borderRadius="4px",this.applePay.btn.style.border="solid 1px #DCDEE2",this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.setBilling=function(t){this.postMessage({event:"setBilling",data:t})},t.prototype.setShipping=function(t){this.postMessage({event:"setShipping",data:t})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=a}})[658](0,t),module.exports.Tokenizer=t.default}();
\ No newline at end of file
diff --git a/dist/tokenizer.js b/dist/tokenizer.js
index 3b0728a..81ee1f1 100644
--- a/dist/tokenizer.js
+++ b/dist/tokenizer.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Tokenizer=e():t.Tokenizer=e()}(self,(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function r(t){try{p(i.next(t))}catch(t){o(t)}}function s(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(r,s)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,r={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(p){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(r=0)),r;)try{if(n=1,i&&(a=2&s[0]?i.return:s[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,s[1])).done)return a;switch(i=0,a&&(s=[2&s[0],a.value]),s[0]){case 0:case 1:a=s;break;case 4:return r.label++,{value:s[1],done:!1};case 5:r.label++,i=s[1],s=[0];continue;case 7:s=r.ops.pop(),r.trys.pop();continue;default:if(!((a=(a=r.trys).length>0&&a[a.length-1])||6!==s[0]&&2!==s[0])){r=0;continue}if(3===s[0]&&(!a||s[1]>a[0]&&s[1]<a[3])){r.label=s[1];break}if(6===s[0]&&r.label<a[1]){r.label=a[1],a=s;break}if(a&&r.label<a[2]){r.label=a[2],r.ops.push(s);break}a[2]&&r.ops.pop(),r.trys.pop();continue}s=e.call(t,r)}catch(t){s=[6,t],i=0}finally{n=a=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a="/api/tokenizer",o=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var r=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});r.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return r.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),r.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},r.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?r.completePayment(ApplePaySession.STATUS_SUCCESS):r.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){r.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{r.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){var t=this.url;return window.location.href.includes("localhost")?"http://localhost:8082".replace(/\/$/,"")+a:t.replace(/\/$/,"")+a},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){document.head.insertAdjacentHTML("beforeend","\n    <style>\n      apple-pay-button {\n          --apple-pay-button-width: 100%;\n          --apple-pay-button-height: 20px;\n          border-radius: 4px;\n          border: solid 1px #DCDEE2;\n      }\n    </style>\n    ");var r=document.createElement("script");r.setAttribute("src","https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js"),r.setAttribute("async",""),r.setAttribute("crossorigin",""),document.head.appendChild(r),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=o}}[658](0,t),t.default}()}));
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Tokenizer=e():t.Tokenizer=e()}(self,(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function s(t){try{p(i.next(t))}catch(t){o(t)}}function r(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(s,r)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,s={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function r(r){return function(p){return function(r){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,r[0]&&(s=0)),s;)try{if(n=1,i&&(a=2&r[0]?i.return:r[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,r[1])).done)return a;switch(i=0,a&&(r=[2&r[0],a.value]),r[0]){case 0:case 1:a=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,i=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!((a=(a=s.trys).length>0&&a[a.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!a||r[1]>a[0]&&r[1]<a[3])){s.label=r[1];break}if(6===r[0]&&s.label<a[1]){s.label=a[1],a=r;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(r);break}a[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],i=0}finally{n=a=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var s=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});s.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return s.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),s.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},s.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?s.completePayment(ApplePaySession.STATUS_SUCCESS):s.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){s.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{s.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");if(!t.apikey.startsWith("pub_"))throw new Error("apikey must be a public apikey and must start with pub_");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){var t;e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,"string"==typeof(null===(t=e.settings.payment)||void 0===t?void 0:t.types)&&(e.settings.payment.types=[e.settings.payment.types],e.settings.payment.forcePaymentSelection=!0),e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){return this.url.replace(/\/$/,"")+"/api/tokenizer"},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){var s=document.createElement("script");s.setAttribute("src","https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"),s.setAttribute("async",""),s.setAttribute("crossorigin",""),document.head.appendChild(s),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.style.setProperty("--apple-pay-button-width","100%"),this.applePay.btn.style.setProperty("--apple-pay-button-height","20px"),this.applePay.btn.style.borderRadius="4px",this.applePay.btn.style.border="solid 1px #DCDEE2",this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.setBilling=function(t){this.postMessage({event:"setBilling",data:t})},t.prototype.setShipping=function(t){this.postMessage({event:"setShipping",data:t})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=a}}[658](0,t),t.default}()}));
\ No newline at end of file
diff --git a/dist/tokenizer.umd.js b/dist/tokenizer.umd.js
index 3b0728a..81ee1f1 100644
--- a/dist/tokenizer.umd.js
+++ b/dist/tokenizer.umd.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Tokenizer=e():t.Tokenizer=e()}(self,(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function r(t){try{p(i.next(t))}catch(t){o(t)}}function s(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(r,s)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,r={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(p){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(r=0)),r;)try{if(n=1,i&&(a=2&s[0]?i.return:s[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,s[1])).done)return a;switch(i=0,a&&(s=[2&s[0],a.value]),s[0]){case 0:case 1:a=s;break;case 4:return r.label++,{value:s[1],done:!1};case 5:r.label++,i=s[1],s=[0];continue;case 7:s=r.ops.pop(),r.trys.pop();continue;default:if(!((a=(a=r.trys).length>0&&a[a.length-1])||6!==s[0]&&2!==s[0])){r=0;continue}if(3===s[0]&&(!a||s[1]>a[0]&&s[1]<a[3])){r.label=s[1];break}if(6===s[0]&&r.label<a[1]){r.label=a[1],a=s;break}if(a&&r.label<a[2]){r.label=a[2],r.ops.push(s);break}a[2]&&r.ops.pop(),r.trys.pop();continue}s=e.call(t,r)}catch(t){s=[6,t],i=0}finally{n=a=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a="/api/tokenizer",o=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var r=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});r.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return r.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),r.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},r.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?r.completePayment(ApplePaySession.STATUS_SUCCESS):r.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){r.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{r.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){var t=this.url;return window.location.href.includes("localhost")?"http://localhost:8082".replace(/\/$/,"")+a:t.replace(/\/$/,"")+a},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){document.head.insertAdjacentHTML("beforeend","\n    <style>\n      apple-pay-button {\n          --apple-pay-button-width: 100%;\n          --apple-pay-button-height: 20px;\n          border-radius: 4px;\n          border: solid 1px #DCDEE2;\n      }\n    </style>\n    ");var r=document.createElement("script");r.setAttribute("src","https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js"),r.setAttribute("async",""),r.setAttribute("crossorigin",""),document.head.appendChild(r),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=o}}[658](0,t),t.default}()}));
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Tokenizer=e():t.Tokenizer=e()}(self,(function(){return function(){"use strict";var t={};return{658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function s(t){try{p(i.next(t))}catch(t){o(t)}}function r(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(s,r)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,s={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function r(r){return function(p){return function(r){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,r[0]&&(s=0)),s;)try{if(n=1,i&&(a=2&r[0]?i.return:r[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,r[1])).done)return a;switch(i=0,a&&(r=[2&r[0],a.value]),r[0]){case 0:case 1:a=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,i=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!((a=(a=s.trys).length>0&&a[a.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!a||r[1]>a[0]&&r[1]<a[3])){s.label=r[1];break}if(6===r[0]&&s.label<a[1]){s.label=a[1],a=r;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(r);break}a[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],i=0}finally{n=a=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var s=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});s.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return s.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),s.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},s.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?s.completePayment(ApplePaySession.STATUS_SUCCESS):s.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){s.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{s.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");if(!t.apikey.startsWith("pub_"))throw new Error("apikey must be a public apikey and must start with pub_");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){var t;e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,"string"==typeof(null===(t=e.settings.payment)||void 0===t?void 0:t.types)&&(e.settings.payment.types=[e.settings.payment.types],e.settings.payment.forcePaymentSelection=!0),e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){return this.url.replace(/\/$/,"")+"/api/tokenizer"},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){var s=document.createElement("script");s.setAttribute("src","https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"),s.setAttribute("async",""),s.setAttribute("crossorigin",""),document.head.appendChild(s),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.style.setProperty("--apple-pay-button-width","100%"),this.applePay.btn.style.setProperty("--apple-pay-button-height","20px"),this.applePay.btn.style.borderRadius="4px",this.applePay.btn.style.border="solid 1px #DCDEE2",this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.setBilling=function(t){this.postMessage({event:"setBilling",data:t})},t.prototype.setShipping=function(t){this.postMessage({event:"setShipping",data:t})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=a}}[658](0,t),t.default}()}));
\ No newline at end of file
diff --git a/dist/tokenizer.var.js b/dist/tokenizer.var.js
index 311136c..9fb74eb 100644
--- a/dist/tokenizer.var.js
+++ b/dist/tokenizer.var.js
@@ -1 +1 @@
-var Tokenizer;!function(){"use strict";var t={658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function r(t){try{p(i.next(t))}catch(t){o(t)}}function s(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(r,s)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,r={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(p){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(r=0)),r;)try{if(n=1,i&&(a=2&s[0]?i.return:s[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,s[1])).done)return a;switch(i=0,a&&(s=[2&s[0],a.value]),s[0]){case 0:case 1:a=s;break;case 4:return r.label++,{value:s[1],done:!1};case 5:r.label++,i=s[1],s=[0];continue;case 7:s=r.ops.pop(),r.trys.pop();continue;default:if(!((a=(a=r.trys).length>0&&a[a.length-1])||6!==s[0]&&2!==s[0])){r=0;continue}if(3===s[0]&&(!a||s[1]>a[0]&&s[1]<a[3])){r.label=s[1];break}if(6===s[0]&&r.label<a[1]){r.label=a[1],a=s;break}if(a&&r.label<a[2]){r.label=a[2],r.ops.push(s);break}a[2]&&r.ops.pop(),r.trys.pop();continue}s=e.call(t,r)}catch(t){s=[6,t],i=0}finally{n=a=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a="/api/tokenizer",o=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var r=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});r.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return r.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),r.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},r.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?r.completePayment(ApplePaySession.STATUS_SUCCESS):r.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){r.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{r.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){var t=this.url;return window.location.href.includes("localhost")?"http://localhost:8082".replace(/\/$/,"")+a:t.replace(/\/$/,"")+a},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){document.head.insertAdjacentHTML("beforeend","\n    <style>\n      apple-pay-button {\n          --apple-pay-button-width: 100%;\n          --apple-pay-button-height: 20px;\n          border-radius: 4px;\n          border: solid 1px #DCDEE2;\n      }\n    </style>\n    ");var r=document.createElement("script");r.setAttribute("src","https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js"),r.setAttribute("async",""),r.setAttribute("crossorigin",""),document.head.appendChild(r),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=o}},e={};t[658](0,e),Tokenizer=e.default}();
\ No newline at end of file
+var Tokenizer;!function(){"use strict";var t={658:function(t,e){var n=this&&this.__awaiter||function(t,e,n,i){return new(n||(n=Promise))((function(a,o){function s(t){try{p(i.next(t))}catch(t){o(t)}}function r(t){try{p(i.throw(t))}catch(t){o(t)}}function p(t){var e;t.done?a(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(s,r)}p((i=i.apply(t,e||[])).next())}))},i=this&&this.__generator||function(t,e){var n,i,a,o,s={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function r(r){return function(p){return function(r){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,r[0]&&(s=0)),s;)try{if(n=1,i&&(a=2&r[0]?i.return:r[0]?i.throw||((a=i.return)&&a.call(i),0):i.next)&&!(a=a.call(i,r[1])).done)return a;switch(i=0,a&&(r=[2&r[0],a.value]),r[0]){case 0:case 1:a=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,i=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!((a=(a=s.trys).length>0&&a[a.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!a||r[1]>a[0]&&r[1]<a[3])){s.label=r[1];break}if(6===r[0]&&s.label<a[1]){s.label=a[1],a=r;break}if(a&&s.label<a[2]){s.label=a[2],s.ops.push(r);break}a[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],i=0}finally{n=a=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,p])}}};Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t){var e=this;if(this.container=null,this.settings={id:"",apikey:"",amount:""},this.applePay={btn:null},this.clickApplePay=function(){var t,a;if(ApplePaySession){var o=null===(a=null===(t=e.settings)||void 0===t?void 0:t.payment)||void 0===a?void 0:a.applePay;if(o){var s=new ApplePaySession(o.version||5,{countryCode:o.payment.countryCode,currencyCode:o.payment.currencyCode,total:o.payment.total,merchantCapabilities:o.payment.merchantCapabilities||["supports3DS"],supportedNetworks:o.payment.supportedNetworks||["amex","chinaUnionPay","discover","interac","masterCard","privateLabel","visa","jcb","cartesBancaires","eftpos","electron","elo","maestro","vPay","mada"],supportedCountries:o.payment.supportedCountries,lineItems:o.payment.lineItems,requiredBillingContactFields:o.payment.requiredBillingContactFields,requiredShippingContactFields:o.payment.requiredShippingContactFields});s.onvalidatemerchant=function(t){return n(e,void 0,void 0,(function(){return i(this,(function(e){return fetch("".concat(this.url,"/api/public/applepay/validatemerchant"),{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({PKeyCompany:o.key,AppleMerchantId:o.appleMerchantID,ValidationUrl:t.validationURL,domainName:o.domainName})}).then((function(t){return t.json()})).then((function(t){return s.completeMerchantValidation(t)})).catch((function(){console.error("merchant validation failed"),s.completeMerchantValidation({error:"merchant validation failed"})})),[2]}))}))},s.onpaymentauthorized=function(t){o.autoPay(t).then((function(t){e.submission({status:t}),"success"===t?s.completePayment(ApplePaySession.STATUS_SUCCESS):s.completePayment(ApplePaySession.STATUS_FAILURE)})).catch((function(){s.completePayment(ApplePaySession.STATUS_FAILURE)}))};try{s.begin()}catch(t){console.error(t)}}else console.error("Apple Pay is missing from configuration")}else console.warn("Apple Pay is not available")},this.onLoad=function(){},this.validCard=function(){},this.achOnChange=function(){},this.magStripeSwipe=function(){},this.onPaymentChange=function(){},this.submission=function(){},this.errorPass=function(){},!t.apikey)throw new Error("apikey must be set!");if(!t.apikey.startsWith("pub_"))throw new Error("apikey must be a public apikey and must start with pub_");this.apikey=t.apikey,this.url=t.url&&""!==t.url?t.url:"{{formUrl}}",t.amount&&(this.amount=t.amount),this.id=this.uuid(),"object"==typeof t.settings&&(this.settings=t.settings),t.onLoad&&(this.onLoad=t.onLoad),t.validCard&&(this.validCard=t.validCard),t.achOnChange&&(this.achOnChange=t.achOnChange),t.magStripeSwipe&&(this.magStripeSwipe=t.magStripeSwipe),t.onPaymentChange&&(this.onPaymentChange=t.onPaymentChange),t.submission&&(this.submission=t.submission),window.addEventListener("message",(function(t){e.messageListener(t)})),this.iframe=this.buildIframe(),this.waitForContainer(t.container,(function(t){if(!t)throw new Error("Could not find container");e.iframe.onload=function(){var t;e.settings.id=e.id,e.settings.apikey=e.apikey,e.settings.amount=e.amount,"string"==typeof(null===(t=e.settings.payment)||void 0===t?void 0:t.types)&&(e.settings.payment.types=[e.settings.payment.types],e.settings.payment.forcePaymentSelection=!0),e.setSettings(e.settings),e.onLoad()},e.container=t,e.container.appendChild(e.iframe),e.initApplePay(t)}))}return t.prototype.create=function(){},t.prototype.getApiKeyURL=function(){return this.getTokenizerURL()+"/"+this.apikey},t.prototype.getTokenizerURL=function(){return this.url.replace(/\/$/,"")+"/api/tokenizer"},t.prototype.initApplePay=function(t){var e,n,i,a,o;if((null===(i=null===(n=null===(e=this.settings)||void 0===e?void 0:e.payment)||void 0===n?void 0:n.types)||void 0===i?void 0:i.includes("apple_pay"))||(null===(o=null===(a=this.settings)||void 0===a?void 0:a.payment)||void 0===o?void 0:o.applePay)){var s=document.createElement("script");s.setAttribute("src","https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"),s.setAttribute("async",""),s.setAttribute("crossorigin",""),document.head.appendChild(s),this.populateApplePayBtn(t)}},t.prototype.populateApplePayBtn=function(t){this.applePay.btn=document.createElement("apple-pay-button"),this.applePay.btn.setAttribute("buttonstyle","white"),this.applePay.btn.setAttribute("type","pay"),this.applePay.btn.setAttribute("locale","en-US"),this.applePay.btn.style.setProperty("--apple-pay-button-width","100%"),this.applePay.btn.style.setProperty("--apple-pay-button-height","20px"),this.applePay.btn.style.borderRadius="4px",this.applePay.btn.style.border="solid 1px #DCDEE2",this.applePay.btn.onclick=this.clickApplePay,t.appendChild(this.applePay.btn)},t.prototype.hideAutoPayButtons=function(t){var e,n=this;""!==t&&"apple_pay"!==t?(null===(e=this.applePay.btn)||void 0===e||e.remove(),this.applePay.btn=null):this.waitForContainer(this.container,(function(t){t&&(n.applePay.btn||n.populateApplePayBtn(t))}))},t.prototype.isSurchargeable=function(t,e){return""!==t&&-1===["CO","CT","ME","MA"].indexOf(t.toUpperCase())&&!(!e||!e.card_type||"credit"!==e.card_type.toLowerCase())},t.prototype.submit=function(t){var e=this;this.getGuardianData().then((function(t){var n;(null===(n=t.events)||void 0===n?void 0:n.length)&&e.postMessage({event:"setGuardian",data:t})})).then((function(){e.postMessage({event:"submit",data:{amount:t}})})).catch((function(){e.postMessage({event:"submit",data:{amount:t}})}))},t.prototype.setExpDate=function(t){this.postMessage({event:"setExpDate",data:{value:t}})},t.prototype.setError=function(t){this.postMessage({event:"setError",data:{input:t}})},t.prototype.setBilling=function(t){this.postMessage({event:"setBilling",data:t})},t.prototype.setShipping=function(t){this.postMessage({event:"setShipping",data:t})},t.prototype.postMessage=function(t){var e=this.iframe.contentWindow;if(null!==e){var n=JSON.stringify(t);e.postMessage(n,"*")}},t.prototype.uuid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},t.prototype.waitForContainer=function(t,e){if(t){var n=Date.now();!function i(){"string"!=typeof t||null===document.querySelector(t)?"string"!=typeof t&&t?e(t):setTimeout((function(){Date.now()-n>1e4?e(null):i()}),1e3):e(document.querySelector(t))}()}else e(null)},t.prototype.buildIframe=function(){var t=document.createElement("iframe");return t.src=this.getApiKeyURL(),t.setAttribute("allow","payment"),t.style.display="block",t.style.border="none",t.style.margin="0px",t.style.padding="0px",t.style.width="1px",t.style.minWidth="100%",t.style.height="30px",t.style.overflow="hidden",t.style.backgroundColor="transparent",t.style.transition="all .3s ease-out",t.frameBorder="0",t},t.prototype.setSettings=function(t){this.postMessage({event:"setSettings",data:t})},t.prototype.updateHeight=function(t){t&&(this.iframe.style.height=t+"px")},t.prototype.getGuardianData=function(){var t=window.Guardian;return t&&t.getData&&"function"==typeof t.getData?t.getData():Promise.reject()},t.prototype.messageListener=function(t){try{var e=JSON.parse(t.data),n=e.id;if(this.id!==n)return;var i=e.event,a=e.data;if(!i)return;switch(i){case"submission":this.submission(a);break;case"validCard":this.validCard(a);break;case"achOnChange":this.achOnChange(a);break;case"magStripeSwipe":this.magStripeSwipe(a);break;case"onPaymentChange":this.onPaymentChange(a.type),this.hideAutoPayButtons(a.type);break;case"setHeight":this.updateHeight(a.height)}}catch(t){}},t}();e.default=a}},e={};t[658](0,e),Tokenizer=e.default}();
\ No newline at end of file
diff --git a/dist/types.d.ts b/dist/types.d.ts
index 3d81db9..e70078e 100644
--- a/dist/types.d.ts
+++ b/dist/types.d.ts
@@ -37,9 +37,10 @@ export interface StylesSettings {
     [key: string]: any;
 }
 export interface PaymentSettings {
-    types: string[];
+    types: string | string[];
     calculateFees: boolean;
     processorId?: string;
+    forcePaymentSelection: boolean;
     showTitle: boolean;
     showLabel: boolean;
     placeholderCreditCard: null | string;
diff --git a/src/tokenizer/index.ts b/src/tokenizer/index.ts
index 001637d..7ad5dc5 100644
--- a/src/tokenizer/index.ts
+++ b/src/tokenizer/index.ts
@@ -135,7 +135,7 @@ export default class Tokenizer {
     }
 
     const applePayScript = document.createElement('script')
-    const applePaySDKUrl = 'https://applepay.cdn-apple.com/jsapi/v1.1.0/apple-pay-sdk.js'
+    const applePaySDKUrl = 'https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js'
     applePayScript.setAttribute('src', applePaySDKUrl)
     applePayScript.setAttribute('async', '')
     applePayScript.setAttribute('crossorigin', '')