diff --git a/demo/js/appr.js b/demo/js/appr.js
index dafed40..c540033 100644
--- a/demo/js/appr.js
+++ b/demo/js/appr.js
@@ -1 +1 @@
-!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var i in n)("object"==typeof exports?exports:e)[i]=n[i]}}(this,function(){return function(e){function t(i){if(n[i])return n[i].exports;var s=n[i]={i:i,l:!1,exports:{}};return e[i].call(s.exports,s,s.exports,t),s.l=!0,s.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,i){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:i})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";if(Object.defineProperty(t,"__esModule",{value:!0}),window.ApplePaySession&&!ApplePaySession.supportsVersion(3)){var i="https://apple.com/apple-pay";t.PaymentRequest=function(){function e(e,t,n){this.paymentRequestID="",this.shippingAddress=null,this.shippingOption="",this.shippingType="shipping",this.paymentResolver=null,this.paymentRejector=null,this.onshippingaddresschange=null,this.onshippingoptionchange=null,this.onpaymentmethodselected=null,this.merchantIdentifier="";var s=!1;this.paymentRequest={countryCode:"",currencyCode:"",lineItems:[],merchantCapabilities:null,supportedNetworks:[],total:null,billingContact:null,requiredBillingContactFields:[],requiredShippingContactFields:[],shippingContact:null,shippingMethods:[],shippingType:"shipping"};for(var a=0,o=e;a<o.length;a++){var p=o[a];if(p.supportedMethods.indexOf(i)>-1||p.supportedMethods===i){if(this.paymentRequest.supportedNetworks=p.data.supportedNetworks,this.paymentRequest.countryCode=p.data.countryCode,3!==p.data.version)throw"Apple Pay needs to be version 3.";p.data.billingContact?this.paymentRequest.billingContact=p.data.billingContact:delete this.paymentRequest.billingContact,p.data.shippingContact?this.paymentRequest.shippingContact=p.data.shippingContact:delete this.paymentRequest.shippingContact,p.data.merchantCapabilities&&(this.paymentRequest.merchantCapabilities=p.data.merchantCapabilities),this.merchantIdentifier=p.data.merchantIdentifier,s=!0;break}}if(!s)throw"Payment method not specified for Apple Pay.";t&&this.updatePaymentDetails(t),n&&(n.requestShipping&&(this.paymentRequest.requiredBillingContactFields.push("postalAddress"),this.paymentRequest.requiredShippingContactFields.push("postalAddress")),n.requestPayerName&&this.paymentRequest.requiredShippingContactFields.push("name"),n.requestPayerEmail&&this.paymentRequest.requiredShippingContactFields.push("email"),n.requestPayerPhone&&this.paymentRequest.requiredShippingContactFields.push("phone"),"pickup"===n.shippingType?this.paymentRequest.shippingType="servicePickup":this.paymentRequest.shippingType=n.shippingType||"shipping"),this.session=new ApplePaySession(1,this.paymentRequest),this.session.addEventListener("validatemerchant",this.onMerchantValidation.bind(this)),this.session.addEventListener("paymentauthorized",this.onPaymentAuthorized.bind(this)),this.session.addEventListener("paymentmethodselected",this.onPaymentMethodSelected.bind(this)),this.session.addEventListener("shippingcontactselected",this.onShippingAddressChange.bind(this)),this.session.addEventListener("shippingmethodselected",this.onShippingOptionChange.bind(this)),this.session.addEventListener("cancel",this.onPaymentCanceled.bind(this))}return e.prototype.updatePaymentDetails=function(e,t,n){if(t){for(var i=[],s=0,a=e.displayItems;s<a.length;s++){for(var o=a[s],p=!1,r=0,h=this.preservedDisplayItems;r<h.length;r++){h[r].label===o.label&&(p=!0)}p||i.push(o)}e.displayItems=i,this.preservedDisplayItems=[];for(var l=0,d=e.modifiers;l<d.length;l++){var u=d[l];if(u.supportedMethods===t&&("basic-card"!=t||!u.data||!u.data.supportedTypes||n&&-1!==u.data.supportedTypes.indexOf(n))){u.additionalDisplayItems&&(e.displayItems=e.displayItems.concat(u.additionalDisplayItems),this.preservedDisplayItems=u.additionalDisplayItems),u.total&&(e.total=u.total);break}}}if(e.displayItems){this.paymentRequest.lineItems=[];for(var c=0,m=e.displayItems;c<m.length;c++){var o=m[c],y={type:!0===o.pending?"pending":"final",label:o.label,amount:o.amount.value};this.paymentRequest.lineItems.push(y)}}if(e.shippingOptions){this.paymentRequest.shippingMethods=[];for(var g=0,f=e.shippingOptions;g<f.length;g++){var v=f[g],S={label:v.label,detail:v.label,amount:v.amount.value,identifier:v.id};this.paymentRequest.shippingMethods.push(S)}}if(!e.total)throw"`total` is required parameter for `PaymentDetailsUpdate`.";this.paymentRequest.currencyCode=e.total.amount.currency,this.paymentRequest.total={type:!0===e.total.pending?"pending":"final",label:e.total.label,amount:e.total.amount.value},this.preservedDetails=e},e.prototype.updatePaymentMethod=function(e){},e.prototype.convertPaymentAddress=function(e){return{country:e.countryCode||"",addressLine:e.addressLines||[],region:e.administrativeArea||"",city:e.locality||"",dependentLocality:"",postalCode:e.postalCode||"",sortingCode:e.country||"",languageCode:"",organization:"",recipient:e.givenName+" "+e.familyName,phone:e.phoneNumber||""}},e.prototype.convertShippingMethod=function(e){for(var t=0,n=this.paymentRequest.shippingMethods;t<n.length;t++){var i=n[t];if(e.identifier===i.identifier)return i.identifier}return""},e.prototype.convertPaymentResponse=function(e){var t=this.convertPaymentAddress(e.shippingContact);return{details:{billingAddress:this.convertPaymentAddress(e.billingContact)},methodName:i,payerEmail:e.shippingContact.emailAddress,payerName:e.billingContact.givenName+" "+e.billingContact.familyName,payerPhone:e.shippingContact.phoneNumber,shippingAddress:t,shippingOption:"",applePayRaw:e,complete:this.onPaymentComplete.bind(this)}},e.prototype.show=function(){var e=this;return this.session.begin(),new Promise(function(t,n){e.paymentResolver=function(e){t(e)},e.paymentRejector=function(e){n(e)}})},e.prototype.abort=function(){this.session.abort()},e.prototype.canMakePayment=function(){if(this.merchantIdentifier)return ApplePaySession.canMakePaymentsWithActiveCard(this.merchantIdentifier);throw"`merchantIdentifier` is not specified."},e.prototype.addEventListener=function(e,t){if("shippingaddresschange"!==e&&"shippingoptionchange"!==e&&"merchantvalidation"!==e)throw'Unknown event type "'+e+'" for `addEventListener`.';this["on"+e]=t},e.prototype.onMerchantValidation=function(e){var t=this;this.onmerchantvalidation&&(e.stopPropagation(),this.onmerchantvalidation({validationURL:e.validationURL,complete:function(e){e.then(function(e){t.session.completeMerchantValidation(e)})}}))},e.prototype.onPaymentMethodSelected=function(e){e.stopPropagation(),this.updatePaymentDetails(this.preservedDetails,"https://apple.com/apple-pay");var t=this.paymentRequest.total,n=this.paymentRequest.lineItems;this.session.completePaymentMethodSelection(t,n)},e.prototype.onShippingAddressChange=function(e){var t=this;if(this.onshippingaddresschange){e.stopPropagation();var n=e.shippingContact;this.shippingAddress=this.convertPaymentAddress(n),this.onshippingaddresschange({updateWith:function(e){e.then(function(e){t.updatePaymentDetails(e),t.session.completeShippingContactSelection(ApplePaySession.STATUS_SUCCESS,t.paymentRequest.shippingMethods,t.paymentRequest.total,t.paymentRequest.lineItems)},function(e){t.updatePaymentDetails(e),t.session.completeShippingContactSelection(ApplePaySession.STATUS_FAILURE,t.paymentRequest.shippingMethods,t.paymentRequest.total,t.paymentRequest.lineItems)})}})}},e.prototype.onShippingOptionChange=function(e){var t=this;if(this.onshippingoptionchange){e.stopPropagation();var n=e.shippingMethod;this.shippingOption=this.convertShippingMethod(n),this.onshippingoptionchange({updateWith:function(e){e.then(function(e){t.updatePaymentDetails(e),t.session.completeShippingMethodSelection(ApplePaySession.STATUS_SUCCESS,t.paymentRequest.total,t.paymentRequest.lineItems)},function(e){t.updatePaymentDetails(e),t.session.completeShippingMethodSelection(ApplePaySession.STATUS_FAILURE,null,null)})}})}},e.prototype.onPaymentAuthorized=function(e){if(this.paymentResolver){var t=this.convertPaymentResponse(e.payment);this.paymentResolver(t),this.paymentResolver=null,this.paymentRejector=null}},e.prototype.onPaymentCanceled=function(){this.paymentRejector&&(this.paymentRejector(),this.paymentResolver=null,this.paymentRejector=null)},e.prototype.onPaymentComplete=function(e){if("success"!==e&&"fail"!==e&&"unknown"!==e&&""!==e)throw"Unkown status code for complete().";var t;switch(e){case"success":t=ApplePaySession.STATUS_SUCCESS;break;case"fail":t=ApplePaySession.STATUS_FAILURE;break;case"unknown":default:t=ApplePaySession.STATUS_SUCCESS}this.session.completePayment(t)},e}()}}])});
\ No newline at end of file
+!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var i in n)("object"==typeof exports?exports:e)[i]=n[i]}}(this,function(){return function(e){function t(i){if(n[i])return n[i].exports;var s=n[i]={i:i,l:!1,exports:{}};return e[i].call(s.exports,s,s.exports,t),s.l=!0,s.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,i){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:i})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";if(Object.defineProperty(t,"__esModule",{value:!0}),window.ApplePaySession&&!ApplePaySession.supportsVersion(3)){var i="https://apple.com/apple-pay";t.PaymentRequest=function(){function e(e,t,n){this.paymentRequestID="",this.shippingAddress=null,this.shippingOption="",this.shippingType="shipping",this.paymentResolver=null,this.paymentRejector=null,this.onshippingaddresschange=null,this.onshippingoptionchange=null,this.onpaymentmethodselected=null,this.merchantIdentifier="";var s=!1;this.paymentRequest={countryCode:"",currencyCode:"",lineItems:[],merchantCapabilities:null,supportedNetworks:[],total:null,billingContact:null,requiredBillingContactFields:[],requiredShippingContactFields:[],shippingContact:null,shippingMethods:[],shippingType:"shipping"};for(var a=0,o=e;a<o.length;a++){var p=o[a];if(p.supportedMethods.indexOf(i)>-1||p.supportedMethods===i){if(this.paymentRequest.supportedNetworks=p.data.supportedNetworks,this.paymentRequest.countryCode=p.data.countryCode,3!==p.data.version)throw"Apple Pay needs to be version 3.";p.data.billingContact?this.paymentRequest.billingContact=p.data.billingContact:delete this.paymentRequest.billingContact,p.data.shippingContact?this.paymentRequest.shippingContact=p.data.shippingContact:delete this.paymentRequest.shippingContact,p.data.merchantCapabilities&&(this.paymentRequest.merchantCapabilities=p.data.merchantCapabilities),this.merchantIdentifier=p.data.merchantIdentifier,s=!0;break}}if(!s)throw"Payment method not specified for Apple Pay.";t&&this.updatePaymentDetails(t),n&&(n.requestShipping&&(this.paymentRequest.requiredBillingContactFields.push("postalAddress"),this.paymentRequest.requiredShippingContactFields.push("postalAddress")),n.requestPayerName&&this.paymentRequest.requiredShippingContactFields.push("name"),n.requestPayerEmail&&this.paymentRequest.requiredShippingContactFields.push("email"),n.requestPayerPhone&&this.paymentRequest.requiredShippingContactFields.push("phone"),"pickup"===n.shippingType?this.paymentRequest.shippingType="servicePickup":this.paymentRequest.shippingType=n.shippingType||"shipping"),this.session=new ApplePaySession(1,this.paymentRequest),this.session.addEventListener("validatemerchant",this.onMerchantValidation.bind(this)),this.session.addEventListener("paymentauthorized",this.onPaymentAuthorized.bind(this)),this.session.addEventListener("paymentmethodselected",this.onPaymentMethodSelected.bind(this)),this.session.addEventListener("shippingcontactselected",this.onShippingAddressChange.bind(this)),this.session.addEventListener("shippingmethodselected",this.onShippingOptionChange.bind(this)),this.session.addEventListener("cancel",this.onPaymentCanceled.bind(this))}return e.prototype.updatePaymentDetails=function(e,t,n){if(t){for(var i=[],s=0,a=e.displayItems;s<a.length;s++){for(var o=a[s],p=!1,r=0,h=this.preservedDisplayItems;r<h.length;r++){h[r].label===o.label&&(p=!0)}p||i.push(o)}e.displayItems=i,this.preservedDisplayItems=[];for(var l=0,d=e.modifiers;l<d.length;l++){var u=d[l];if(u.supportedMethods===t){u.additionalDisplayItems&&(e.displayItems=e.displayItems.concat(u.additionalDisplayItems),this.preservedDisplayItems=u.additionalDisplayItems),u.total&&(e.total=u.total);break}}}if(e.displayItems){this.paymentRequest.lineItems=[];for(var c=0,m=e.displayItems;c<m.length;c++){var o=m[c],y={type:!0===o.pending?"pending":"final",label:o.label,amount:o.amount.value};this.paymentRequest.lineItems.push(y)}}if(e.shippingOptions){this.paymentRequest.shippingMethods=[];for(var g=0,f=e.shippingOptions;g<f.length;g++){var v=f[g],S={label:v.label,detail:v.label,amount:v.amount.value,identifier:v.id};this.paymentRequest.shippingMethods.push(S)}}if(!e.total)throw"`total` is required parameter for `PaymentDetailsUpdate`.";this.paymentRequest.currencyCode=e.total.amount.currency,this.paymentRequest.total={type:!0===e.total.pending?"pending":"final",label:e.total.label,amount:e.total.amount.value},this.preservedDetails=e},e.prototype.updatePaymentMethod=function(e){},e.prototype.convertPaymentAddress=function(e){return{country:e.countryCode||"",addressLine:e.addressLines||[],region:e.administrativeArea||"",city:e.locality||"",dependentLocality:"",postalCode:e.postalCode||"",sortingCode:e.country||"",languageCode:"",organization:"",recipient:e.givenName+" "+e.familyName,phone:e.phoneNumber||""}},e.prototype.convertShippingMethod=function(e){for(var t=0,n=this.paymentRequest.shippingMethods;t<n.length;t++){var i=n[t];if(e.identifier===i.identifier)return i.identifier}return""},e.prototype.convertPaymentResponse=function(e){var t=this.convertPaymentAddress(e.shippingContact);return{details:{billingAddress:this.convertPaymentAddress(e.billingContact)},methodName:i,payerEmail:e.shippingContact.emailAddress,payerName:e.billingContact.givenName+" "+e.billingContact.familyName,payerPhone:e.shippingContact.phoneNumber,shippingAddress:t,shippingOption:"",applePayRaw:e,complete:this.onPaymentComplete.bind(this)}},e.prototype.show=function(){var e=this;return this.session.begin(),new Promise(function(t,n){e.paymentResolver=function(e){t(e)},e.paymentRejector=function(e){n(e)}})},e.prototype.abort=function(){this.session.abort()},e.prototype.canMakePayment=function(){if(this.merchantIdentifier)return ApplePaySession.canMakePaymentsWithActiveCard(this.merchantIdentifier);throw"`merchantIdentifier` is not specified."},e.prototype.addEventListener=function(e,t){if("shippingaddresschange"!==e&&"shippingoptionchange"!==e&&"merchantvalidation"!==e)throw'Unknown event type "'+e+'" for `addEventListener`.';this["on"+e]=t},e.prototype.onMerchantValidation=function(e){var t=this;this.onmerchantvalidation&&(e.stopPropagation(),this.onmerchantvalidation({validationURL:e.validationURL,complete:function(e){e.then(function(e){t.session.completeMerchantValidation(e)})}}))},e.prototype.onPaymentMethodSelected=function(e){e.stopPropagation(),this.updatePaymentDetails(this.preservedDetails,"https://apple.com/apple-pay");var t=this.paymentRequest.total,n=this.paymentRequest.lineItems;this.session.completePaymentMethodSelection(t,n)},e.prototype.onShippingAddressChange=function(e){var t=this;if(this.onshippingaddresschange){e.stopPropagation();var n=e.shippingContact;this.shippingAddress=this.convertPaymentAddress(n),this.onshippingaddresschange({updateWith:function(e){e.then(function(e){t.updatePaymentDetails(e),t.session.completeShippingContactSelection(ApplePaySession.STATUS_SUCCESS,t.paymentRequest.shippingMethods,t.paymentRequest.total,t.paymentRequest.lineItems)},function(e){t.updatePaymentDetails(e),t.session.completeShippingContactSelection(ApplePaySession.STATUS_FAILURE,t.paymentRequest.shippingMethods,t.paymentRequest.total,t.paymentRequest.lineItems)})}})}},e.prototype.onShippingOptionChange=function(e){var t=this;if(this.onshippingoptionchange){e.stopPropagation();var n=e.shippingMethod;this.shippingOption=this.convertShippingMethod(n),this.onshippingoptionchange({updateWith:function(e){e.then(function(e){t.updatePaymentDetails(e),t.session.completeShippingMethodSelection(ApplePaySession.STATUS_SUCCESS,t.paymentRequest.total,t.paymentRequest.lineItems)},function(e){t.updatePaymentDetails(e),t.session.completeShippingMethodSelection(ApplePaySession.STATUS_FAILURE,null,null)})}})}},e.prototype.onPaymentAuthorized=function(e){if(this.paymentResolver){var t=this.convertPaymentResponse(e.payment);this.paymentResolver(t),this.paymentResolver=null,this.paymentRejector=null}},e.prototype.onPaymentCanceled=function(){this.paymentRejector&&(this.paymentRejector(),this.paymentResolver=null,this.paymentRejector=null)},e.prototype.onPaymentComplete=function(e){if("success"!==e&&"fail"!==e&&"unknown"!==e&&""!==e)throw"Unkown status code for complete().";var t;switch(e){case"success":t=ApplePaySession.STATUS_SUCCESS;break;case"fail":t=ApplePaySession.STATUS_FAILURE;break;case"unknown":default:t=ApplePaySession.STATUS_SUCCESS}this.session.completePayment(t)},e}()}}])});
\ No newline at end of file
diff --git a/demo/js/payment-request.js b/demo/js/payment-request.js
index 1ae2edb..0dccb45 100644
--- a/demo/js/payment-request.js
+++ b/demo/js/payment-request.js
@@ -68,14 +68,6 @@ function onBuyClicked(event) {
   event.preventDefault();
 
   let supportedInstruments = [{
-    supportedMethods: 'basic-card',
-    data: {
-      supportedNetworks: [
-        'visa', 'mastercard', 'amex', 'discover',
-        'diners', 'jcb', 'unionpay'
-      ]
-    }
-  }, {
     supportedMethods: 'https://apple.com/apple-pay',
     data: {
       supportedNetworks: [
@@ -186,9 +178,8 @@ function onBuyClicked(event) {
         console.log('This is Bobpay');
         console.log(response);
         break;
-      case 'basic-card':
       default:
-        console.log('This is basic-card');
+        console.log('This is ' + response.methodName);
         console.log(response);
         break;
     }
diff --git a/demo/js/script.js b/demo/js/script.js
index 5a9630e..f3262a4 100644
--- a/demo/js/script.js
+++ b/demo/js/script.js
@@ -62,14 +62,6 @@ class priceCalc {
 }
 
 const methods = [{
-  supportedMethods: 'basic-card',
-  data: {
-    supportedNetworks: [
-      'visa', 'mastercard', 'amex', 'discover',
-      'diners', 'jcb', 'unionpay'
-    ]
-  }
-}, {
   supportedMethods: 'https://apple.com/apple-pay',
   data: {
     supportedNetworks: [
@@ -194,9 +186,8 @@ function onBuyClicked(event) {
         console.log('This is Bobpay');
         console.log(response);
         break;
-      case 'basic-card':
       default:
-        console.log('This is basic-card');
+        console.log('This is ' + response.methodName);
         console.log(response);
         break;
     }
diff --git a/dist/appr.js b/dist/appr.js
index e0d261f..4a07d55 100644
--- a/dist/appr.js
+++ b/dist/appr.js
@@ -199,7 +199,7 @@ if (window.ApplePaySession && !ApplePaySession.supportsVersion(3)) {
             this.session.addEventListener('shippingmethodselected', this.onShippingOptionChange.bind(this));
             this.session.addEventListener('cancel', this.onPaymentCanceled.bind(this));
         }
-        class_1.prototype.updatePaymentDetails = function (details, selectedMethod, selectedType) {
+        class_1.prototype.updatePaymentDetails = function (details, selectedMethod) {
             if (selectedMethod) {
                 var newDisplayItems = [];
                 for (var _i = 0, _a = details.displayItems; _i < _a.length; _i++) {
@@ -219,13 +219,6 @@ if (window.ApplePaySession && !ApplePaySession.supportsVersion(3)) {
                     var modifier = _e[_d];
                     if (modifier.supportedMethods !== selectedMethod)
                         continue;
-                    if (selectedMethod == 'basic-card' &&
-                        modifier.data &&
-                        modifier.data.supportedTypes) {
-                        if (!selectedType ||
-                            modifier.data.supportedTypes.indexOf(selectedType) === -1)
-                            continue;
-                    }
                     if (modifier.additionalDisplayItems) {
                         details.displayItems = details.displayItems.concat(modifier.additionalDisplayItems);
                         this.preservedDisplayItems = modifier.additionalDisplayItems;
diff --git a/src/index.ts b/src/index.ts
index d41b4cc..fb98283 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -147,7 +147,6 @@ if ((<any>window).ApplePaySession && !ApplePaySession.supportsVersion(3)) {
     private updatePaymentDetails(
       details: PaymentDetailsUpdate,
       selectedMethod?: string,
-      selectedType?: string
     ): void {
       if (selectedMethod) {
         // Get rid of existing preserved display items
@@ -167,18 +166,6 @@ if ((<any>window).ApplePaySession && !ApplePaySession.supportsVersion(3)) {
           if (modifier.supportedMethods !== selectedMethod)
             continue;
 
-          // if supported method is 'basic-card' and
-          // supported type is specified, check if it matches
-          // Otherwise ignore.
-          // (This is technically useless on Safari)
-          if (selectedMethod == 'basic-card' &&
-              modifier.data &&
-              modifier.data.supportedTypes) {
-            if (!selectedType ||
-                modifier.data.supportedTypes.indexOf(selectedType) === -1)
-              continue;
-          }
-
           if (modifier.additionalDisplayItems) {
             // Concatenate existing display items and additional ones
             details.displayItems =