diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 785112211..da9d965ad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @rkewlani @AlexandrosMor @martinsrenato @Aleffio @rikterbeek
+* @rkewlani @martinsrenato @Aleffio @rikterbeek
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
index 85b5289e7..3fa6653f2 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
@@ -25,7 +25,6 @@ public interface AdyenControllerConstants
 	String ADDON_PREFIX = "addon:/adyenv6b2ccheckoutaddon/";
 	String SELECT_PAYMENT_METHOD_PREFIX = "/checkout/multi/adyen/select-payment-method";
 	String SUMMARY_CHECKOUT_PREFIX = "/checkout/multi/adyen/summary";
-	String PAYPAL_ECS_PREFIX = "/adyen/paypal-ecs";
 	String COMPONENT_PREFIX = "/adyen/component";
 
 	/**
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenPaypalEcsController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenPaypalEcsController.java
deleted file mode 100644
index 05ba6f5b2..000000000
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenPaypalEcsController.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.controllers.pages;
-
-import java.security.SignatureException;
-import java.util.Map;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import com.adyen.constants.HPPConstants;
-import com.adyen.v6.constants.AdyenControllerConstants;
-import com.adyen.v6.facades.AdyenCheckoutFacade;
-import com.adyen.v6.facades.AdyenPaypalFacade;
-import de.hybris.platform.acceleratorfacades.flow.CheckoutFlowFacade;
-import de.hybris.platform.acceleratorservices.urlresolver.SiteBaseUrlResolutionService;
-import de.hybris.platform.acceleratorstorefrontcommons.constants.WebConstants;
-import de.hybris.platform.acceleratorstorefrontcommons.controllers.util.GlobalMessages;
-import de.hybris.platform.acceleratorstorefrontcommons.security.GUIDCookieStrategy;
-import de.hybris.platform.basecommerce.model.site.BaseSiteModel;
-import de.hybris.platform.commercefacades.customer.CustomerFacade;
-import de.hybris.platform.commercefacades.user.UserFacade;
-import de.hybris.platform.commerceservices.customer.DuplicateUidException;
-import de.hybris.platform.order.InvalidCartException;
-import de.hybris.platform.servicelayer.session.SessionService;
-import de.hybris.platform.site.BaseSiteService;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT;
-import static com.adyen.v6.constants.AdyenControllerConstants.PAYPAL_ECS_PREFIX;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_SHOPPER_EMAIL;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_SHOPPER_FIRST_NAME;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_SHOPPER_LAST_NAME;
-import static de.hybris.platform.acceleratorstorefrontcommons.controllers.AbstractController.REDIRECT_PREFIX;
-
-@Controller
-@RequestMapping(PAYPAL_ECS_PREFIX)
-public class AdyenPaypalEcsController {
-    private static final Logger LOG = Logger.getLogger(AdyenPaypalEcsController.class);
-    private static final String PROCESS_URL = "/process";
-
-    @Resource(name = "siteBaseUrlResolutionService")
-    private SiteBaseUrlResolutionService siteBaseUrlResolutionService;
-
-    @Resource(name = "baseSiteService")
-    private BaseSiteService baseSiteService;
-
-    @Resource(name = "adyenPaypalFacade")
-    private AdyenPaypalFacade adyenPaypalFacade;
-
-    @Resource(name = "adyenCheckoutFacade")
-    private AdyenCheckoutFacade adyenCheckoutFacade;
-
-    @Resource(name = "checkoutFlowFacade")
-    private CheckoutFlowFacade checkoutFlowFacade;
-
-    @Resource(name = "guidCookieStrategy")
-    private GUIDCookieStrategy guidCookieStrategy;
-
-    @Resource(name = "customerFacade")
-    private CustomerFacade customerFacade;
-
-    @Resource(name = "sessionService")
-    private SessionService sessionService;
-
-    @Resource(name = "userFacade")
-    private UserFacade userFacade;
-
-    @RequestMapping(value = "/initialize", method = RequestMethod.GET)
-    public String initialize(final Model model, final RedirectAttributes redirectModel, final HttpServletRequest request) {
-        try {
-            Map<String, String> hppFormData = adyenPaypalFacade.initializePaypalECS(getRedirectUrl());
-
-            //Building HPP data
-            model.addAttribute("hppUrl", adyenCheckoutFacade.getHppUrl());
-            model.addAttribute("hppFormData", hppFormData);
-
-            return AdyenControllerConstants.Views.Pages.MultiStepCheckout.HppPaymentPage;
-        } catch (SignatureException | InvalidCartException e) {
-            LOG.error(e);
-        }
-
-        LOG.debug("Redirecting to cart..");
-        GlobalMessages.addFlashMessage(redirectModel, GlobalMessages.ERROR_MESSAGES_HOLDER, "checkout.error.authorization.payment.error");
-        return REDIRECT_PREFIX + "/cart";
-    }
-
-    @RequestMapping(value = PROCESS_URL)
-    public String process(final HttpServletRequest request, final HttpServletResponse response, final RedirectAttributes redirectModel) {
-        try {
-            //Handle PP ECS response
-            boolean success = adyenPaypalFacade.handlePaypalECSResponse(request);
-
-            //On success, update user and cart
-            if (success) {
-                //If the user is anonymous, convert him to guest
-                if (userFacade.isAnonymousUser()) {
-                    getCustomerFacade().createGuestUserForAnonymousCheckout(request.getParameter(PAYPAL_ECS_SHOPPER_EMAIL),
-                                                                            request.getParameter(PAYPAL_ECS_SHOPPER_FIRST_NAME) + request.getParameter(PAYPAL_ECS_SHOPPER_LAST_NAME));
-                    getGuidCookieStrategy().setCookie(request, response);
-                    getSessionService().setAttribute(WebConstants.ANONYMOUS_CHECKOUT, Boolean.TRUE);
-                }
-
-                //Update the cart
-                adyenPaypalFacade.updateCart(request, false);
-
-                //Pick the cheapest delivery mode and redirect to the last step of checkout
-                checkoutFlowFacade.setCheapestDeliveryModeForCheckout();
-
-                return REDIRECT_PREFIX + "/checkout/multi/adyen/summary/view";
-            }
-
-            //In case of error, display the appropriate flash message
-            switch (request.getParameter(AUTH_RESULT)) {
-                case HPPConstants.Response.AUTH_RESULT_REFUSED:
-                    GlobalMessages.addFlashMessage(redirectModel, GlobalMessages.ERROR_MESSAGES_HOLDER, "checkout.error.authorization.payment.refused");
-                    break;
-                case HPPConstants.Response.AUTH_RESULT_CANCELLED:
-                    GlobalMessages.addFlashMessage(redirectModel, GlobalMessages.ERROR_MESSAGES_HOLDER, "checkout.error.authorization.payment.cancelled");
-                    break;
-                case HPPConstants.Response.AUTH_RESULT_ERROR:
-                default:
-                    GlobalMessages.addFlashMessage(redirectModel, GlobalMessages.ERROR_MESSAGES_HOLDER, "checkout.error.authorization.payment.error");
-                    break;
-            }
-        } catch (SignatureException | InvalidCartException | DuplicateUidException e) {
-            LOG.warn(e);
-            GlobalMessages.addFlashMessage(redirectModel, GlobalMessages.ERROR_MESSAGES_HOLDER, "checkout.error.authorization.payment.error");
-        }
-
-        LOG.debug("Redirecting to cart..");
-        return REDIRECT_PREFIX + "/cart";
-    }
-
-    /**
-     * Construct the URL for PP ECS redirect
-     */
-    private String getRedirectUrl() {
-        String url = PAYPAL_ECS_PREFIX + PROCESS_URL;
-        BaseSiteModel currentBaseSite = baseSiteService.getCurrentBaseSite();
-
-        return siteBaseUrlResolutionService.getWebsiteUrlForSite(currentBaseSite, true, url);
-    }
-
-    public SiteBaseUrlResolutionService getSiteBaseUrlResolutionService() {
-        return siteBaseUrlResolutionService;
-    }
-
-    public void setSiteBaseUrlResolutionService(SiteBaseUrlResolutionService siteBaseUrlResolutionService) {
-        this.siteBaseUrlResolutionService = siteBaseUrlResolutionService;
-    }
-
-    public BaseSiteService getBaseSiteService() {
-        return baseSiteService;
-    }
-
-    public void setBaseSiteService(BaseSiteService baseSiteService) {
-        this.baseSiteService = baseSiteService;
-    }
-
-    public AdyenPaypalFacade getAdyenPaypalFacade() {
-        return adyenPaypalFacade;
-    }
-
-    public void setAdyenPaypalFacade(AdyenPaypalFacade adyenPaypalFacade) {
-        this.adyenPaypalFacade = adyenPaypalFacade;
-    }
-
-    public AdyenCheckoutFacade getAdyenCheckoutFacade() {
-        return adyenCheckoutFacade;
-    }
-
-    public void setAdyenCheckoutFacade(AdyenCheckoutFacade adyenCheckoutFacade) {
-        this.adyenCheckoutFacade = adyenCheckoutFacade;
-    }
-
-    public CheckoutFlowFacade getCheckoutFlowFacade() {
-        return checkoutFlowFacade;
-    }
-
-    public void setCheckoutFlowFacade(CheckoutFlowFacade checkoutFlowFacade) {
-        this.checkoutFlowFacade = checkoutFlowFacade;
-    }
-
-    public GUIDCookieStrategy getGuidCookieStrategy() {
-        return guidCookieStrategy;
-    }
-
-    public void setGuidCookieStrategy(GUIDCookieStrategy guidCookieStrategy) {
-        this.guidCookieStrategy = guidCookieStrategy;
-    }
-
-    public CustomerFacade getCustomerFacade() {
-        return customerFacade;
-    }
-
-    public void setCustomerFacade(CustomerFacade customerFacade) {
-        this.customerFacade = customerFacade;
-    }
-
-    public SessionService getSessionService() {
-        return sessionService;
-    }
-
-    public void setSessionService(SessionService sessionService) {
-        this.sessionService = sessionService;
-    }
-
-    public UserFacade getUserFacade() {
-        return userFacade;
-    }
-
-    public void setUserFacade(UserFacade userFacade) {
-        this.userFacade = userFacade;
-    }
-}
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
index 96ac8e710..e9ff3b285 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
@@ -75,7 +75,6 @@
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.FINGERPRINT_TOKEN;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_CHALLENGE_TOKEN;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_FINGERPRINT_TOKEN;
-import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
 import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER;
@@ -172,8 +171,7 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
         String errorMessage = "checkout.error.authorization.failed";
 
         String adyenPaymentMethod = cartData.getAdyenPaymentMethod();
-
-        if (canUseAPI(adyenPaymentMethod)) {
+        if (adyenPaymentMethod.equals(RATEPAY)) {
             try {
                 OrderData orderData = adyenCheckoutFacade.authorisePayment(request, cartData);
                 LOGGER.debug("Redirecting to confirmation!");
@@ -229,7 +227,7 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
             }
         } else {
             try {
-                cartData.setAdyenReturnUrl(getReturnUrl());
+                cartData.setAdyenReturnUrl(getReturnUrl(cartData.getAdyenPaymentMethod()));
                 OrderData orderData = adyenCheckoutFacade.authorisePayment(request, cartData);
                 //In case of Boleto, show link to pdf
                 if (PAYMENT_METHOD_BOLETO.equals(cartData.getAdyenPaymentMethod())) {
@@ -244,15 +242,11 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                 LOGGER.debug("Handling AdyenNonAuthorizedPaymentException. Checking PaymentResponse.");
                 PaymentsResponse paymentsResponse = e.getPaymentsResponse();
                 if (REDIRECTSHOPPER == paymentsResponse.getResultCode()) {
-                    LOGGER.debug("PaymentResponse resultCode is REDIRECTSHOPPER, redirecting shopper to 3DS flow");
                     if (is3DSPaymentMethod(adyenPaymentMethod)) {
-                        final String termUrl = getTermUrl();
-                        model.addAttribute("paReq", paymentsResponse.getRedirect().getData().get(PAREQ));
-                        model.addAttribute("md", paymentsResponse.getRedirect().getData().get(MD));
-                        model.addAttribute("issuerUrl", paymentsResponse.getRedirect().getUrl());
-                        model.addAttribute("termUrl", termUrl);
-                        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DSecurePaymentPage;
+                        LOGGER.debug("PaymentResponse resultCode is REDIRECTSHOPPER, redirecting shopper to 3DS flow");
+                        return redirectTo3DSValidation(model, paymentsResponse);
                     }
+                    LOGGER.debug("PaymentResponse resultCode is REDIRECTSHOPPER, redirecting shopper to local payment method page");
                     return REDIRECT_PREFIX + paymentsResponse.getRedirect().getUrl();
                 }
                 if (REFUSED == paymentsResponse.getResultCode()) {
@@ -286,13 +280,19 @@ public String authorise3DS2Payment(final Model model,
         } catch (AdyenNonAuthorizedPaymentException e) {
             LOGGER.debug("Handling AdyenNonAuthorizedPaymentException. Checking PaymentResponse.");
             PaymentsResponse paymentsResponse = e.getPaymentsResponse();
-            if (paymentsResponse != null && (paymentsResponse.getResultCode() == CHALLENGESHOPPER || paymentsResponse.getResultCode() == IDENTIFYSHOPPER)) {
-                LOGGER.debug("PaymentResponse is "+paymentsResponse.getResultCode()+", redirecting to 3DS2 flow");
-                return redirectTo3DS2Validation(model, paymentsResponse);
-            }
-            if (paymentsResponse != null && paymentsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
-                errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
-                LOGGER.debug("PaymentResponse is REFUSED: " + errorMessage);
+            if(paymentsResponse != null) {
+                if (paymentsResponse.getResultCode() == CHALLENGESHOPPER || paymentsResponse.getResultCode() == IDENTIFYSHOPPER) {
+                    LOGGER.debug("PaymentResponse is " + paymentsResponse.getResultCode() + ", redirecting to 3DS2 flow");
+                    return redirectTo3DS2Validation(model, paymentsResponse);
+                }
+                if (paymentsResponse.getResultCode() == REDIRECTSHOPPER) {
+                    LOGGER.debug("PaymentResponse is " + paymentsResponse.getResultCode() + ", redirecting to 3DS flow");
+                    return redirectTo3DSValidation(model, paymentsResponse);
+                }
+                if (paymentsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
+                    errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
+                    LOGGER.debug("PaymentResponse is REFUSED: " + errorMessage);
+                }
             }
             return redirectToSelectPaymentMethodWithError(redirectModel, errorMessage);
         } catch (CalculationException | InvalidCartException e) {
@@ -305,7 +305,7 @@ public String authorise3DS2Payment(final Model model,
         return REDIRECT_PREFIX + "/cart";
     }
 
-    @RequestMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL, method = RequestMethod.POST)
+    @RequestMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
     public String authorise3DSecurePayment(final RedirectAttributes redirectModel,
                                            final HttpServletRequest request) {
@@ -417,20 +417,7 @@ private void addMultibancoMessage(RedirectAttributes redirectModel, final String
                                                + "</p>");
     }
 
-    /**
-     * Methods supported via API
-     * Credit Cards/OneClick
-     * OpenInvoice
-     * Boleto
-     */
-    private boolean canUseAPI(String paymentMethod) {
-        Set<String> apiPaymentMethods = new HashSet<>();
-
-        apiPaymentMethods.add(PAYPAL_ECS);
-        apiPaymentMethods.add(RATEPAY);
 
-        return apiPaymentMethods.contains(paymentMethod);
-    }
 
     private boolean is3DSPaymentMethod(String adyenPaymentMethod) {
         return adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0;
@@ -443,6 +430,16 @@ private String redirectToSelectPaymentMethodWithError(final RedirectAttributes r
         return REDIRECT_PREFIX + AdyenControllerConstants.SELECT_PAYMENT_METHOD_PREFIX;
     }
 
+    private String redirectTo3DSValidation(Model model, PaymentsResponse paymentsResponse) {
+        if (paymentsResponse.getRedirect() != null && paymentsResponse.getRedirect().getData() != null) {
+            model.addAttribute("termUrl", paymentsResponse.getRedirect().getData().get("TermUrl"));
+            model.addAttribute("paReq", paymentsResponse.getRedirect().getData().get(PAREQ));
+            model.addAttribute("md", paymentsResponse.getRedirect().getData().get(MD));
+            model.addAttribute("issuerUrl", paymentsResponse.getRedirect().getUrl());
+        }
+        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DSecurePaymentPage;
+    }
+
     private String redirectTo3DS2Validation(Model model, PaymentsResponse paymentsResponse) {
         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
         model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
@@ -456,18 +453,13 @@ private String redirectTo3DS2Validation(Model model, PaymentsResponse paymentsRe
         return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
     }
 
-    private String getTermUrl() {
-        String authorise3DSecureUrl = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX + AUTHORISE_3D_SECURE_PAYMENT_URL;
-        BaseSiteModel currentBaseSite = baseSiteService.getCurrentBaseSite();
-
-        return siteBaseUrlResolutionService.getWebsiteUrlForSite(currentBaseSite, true, authorise3DSecureUrl);
-    }
-
-    /**
-     * Construct the URL for HPP redirect
-     */
-    private String getReturnUrl() {
-        String url = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX + HPP_RESULT_URL;
+    private String getReturnUrl(String adyenPaymentMethod) {
+        String url;
+        if (is3DSPaymentMethod(adyenPaymentMethod)) {
+            url = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX + AUTHORISE_3D_SECURE_PAYMENT_URL;
+        } else {
+            url = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX + HPP_RESULT_URL;
+        }
         BaseSiteModel currentBaseSite = baseSiteService.getCurrentBaseSite();
 
         return siteBaseUrlResolutionService.getWebsiteUrlForSite(currentBaseSite, true, url);
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
index 19a1ac90a..79f85ae35 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
@@ -18,3 +18,18 @@ text.account.storedCards=Stored Cards
 text.account.storedCard.delete.popup.title=Remove card
 text.account.storedCard.delete.error=An error occurred while removing the card
 text.account.storedCard.delete.success=The card has been removed
+
+payment.method.billing.information=Billing Information
+payment.method.payment.information=Payment Information
+payment.method.cards.combo=Select credit or debit card
+payment.method.cards.credit=Credit
+payment.method.cards.debit=Debit
+payment.method.date.of.birth=Date of birth
+payment.method.social.security.number=Social security number (CPF/CNPJ)
+payment.method.personal.number=Personal number (last 4 digits)
+payment.method.first.name=First name
+payment.method.last.name=Last name
+payment.method.issuer.selector=Please select issuer
+payment.method.terminal.selector=Select your terminal
+
+checkout.summary.spinner.message=Please wait while your payment is processed. Do not click back or refresh the page.
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
new file mode 100644
index 000000000..79f85ae35
--- /dev/null
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
@@ -0,0 +1,35 @@
+
+checkout.error.authorization.transaction.not.permitted=The transaction is not permitted.
+checkout.error.authorization.cvc.declined=The payment is REFUSED. Please check your Card details.
+checkout.error.authorization.restricted.card=The card is restricted.
+checkout.error.authorization.payment.detail.not.found=The payment is REFUSED because the saved card is removed. Please try an other payment method.
+checkout.error.authorization.payment.refused=The payment is REFUSED.
+checkout.error.authorization.payment.cancelled=The payment is Cancelled.
+checkout.error.authorization.payment.error=An error occurred.
+checkout.error.authorization.pos.configuration=Error reaching POS terminal. Check the terminal connection/configuration and try again.
+checkout.error.authorization.pos.busy=The terminal is busy. Wait for the current transaction to end and try again later.
+checkout.error.authorization.pos.pin=The payment is REFUSED. Please check your Card details.
+checkout.error.billing.address=Some fields were not filled in correctly. Please check if your details are correct
+
+text.account.storedCards.empty=There are no stored cards
+text.account.storedCard.delete=Remove
+text.account.storedCard.delete.following=Remove the following card
+text.account.storedCards=Stored Cards
+text.account.storedCard.delete.popup.title=Remove card
+text.account.storedCard.delete.error=An error occurred while removing the card
+text.account.storedCard.delete.success=The card has been removed
+
+payment.method.billing.information=Billing Information
+payment.method.payment.information=Payment Information
+payment.method.cards.combo=Select credit or debit card
+payment.method.cards.credit=Credit
+payment.method.cards.debit=Debit
+payment.method.date.of.birth=Date of birth
+payment.method.social.security.number=Social security number (CPF/CNPJ)
+payment.method.personal.number=Personal number (last 4 digits)
+payment.method.first.name=First name
+payment.method.last.name=Last name
+payment.method.issuer.selector=Please select issuer
+payment.method.terminal.selector=Select your terminal
+
+checkout.summary.spinner.message=Please wait while your payment is processed. Do not click back or refresh the page.
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
index fbaac46ff..ce1bbb62b 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
@@ -30,6 +30,7 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="adyen" tagdir="/WEB-INF/tags/addons/adyenv6b2ccheckoutaddon/responsive" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <div class="chckt-pm chckt-pm-${brandCode} js-chckt-pm" data-pm="${brandCode}">
     <div class="chckt-pm__header js-chckt-pm__header">
@@ -45,7 +46,9 @@
             <c:if test="${not empty issuers}">
                 <label class="chckt-form-label chckt-form-label--full-width">
                     <select class="chckt-select-box js-chckt-issuer-select-box" id="p_method_adyen_hpp_${brandCode}_issuer" name="${brandCode}Issuer">
-                        <option value="" label="Please select Issuer"/>
+                        <option value="">
+                            <spring:theme code="payment.method.issuer.selector"/>
+                        </option>
                         <c:forEach items="${issuers}" var="issuer">
                             <option value="${issuer.issuerId}">${issuer.name}</option>
                         </c:forEach>
@@ -57,7 +60,9 @@
                 <c:if test="${not empty connectedTerminalList}">
                     <label class="chckt-form-label chckt-form-label--full-width">
                         <select class="chckt-select-box js-chckt-terminal-select-box" id="adyen_pos_terminal" name="${brandCode}">
-                            <option value="" label="SELECT YOUR TERMINAL"/>
+                            <option value="">
+                                <spring:theme code="payment.method.terminal.selector"/>
+                            </option>
                             <c:forEach items="${connectedTerminalList}" var="connectedTerminal">
                                 <option value="${connectedTerminal}">${connectedTerminal}</option>
                             </c:forEach>
@@ -68,7 +73,9 @@
 
             <c:if test="${showDob}">
                 <label for="p_method_adyen_hpp_${brandCode}_dob">
-                    <span>Date of birth</span>
+                    <span>
+                        <spring:theme code="payment.method.date.of.birth"/>
+                    </span>
                 </label>
                 <input id="p_method_adyen_hpp_${brandCode}_dob"
                        class="p_method_adyen_hpp_dob"
@@ -80,13 +87,17 @@
                 <c:choose>
                     <c:when test="${countryCode=='BR'}">
                         <label for="p_method_adyen_hpp_${brandCode}_ssn">
-                            <span>Social Security Number (CPF/CNPJ)</span>
+                            <span>
+                                <spring:theme code="payment.method.social.security.number"/>
+                            </span>
                         </label>
                         <input id="p_method_adyen_hpp_${brandCode}_ssn" class="p_method_adyen_hpp_ssn" type="text">
                     </c:when>
                     <c:otherwise>
                         <label for="p_method_adyen_hpp_${brandCode}_ssn">
-                            <span>Personal Number (last 4 digits)</span>
+                            <span>
+                                <spring:theme code="payment.method.personal.number"/>
+                            </span>
                         </label>
                         <input id="p_method_adyen_hpp_${brandCode}_ssn" class="p_method_adyen_hpp_ssn" type="text" size="4" title="personal number">
                     </c:otherwise>
@@ -95,7 +106,9 @@
 
             <c:if test="${showFirstName}">
                 <label for="p_method_adyen_hpp_${brandCode}_first_name">
-                    <span>First name</span>
+                    <span>
+                        <spring:theme code="payment.method.first.name"/>
+                    </span>
                 </label>
 
                 <input id="p_method_adyen_hpp_${brandCode}_first_name"
@@ -106,7 +119,9 @@
 
             <c:if test="${showLastName}">
                 <label for="p_method_adyen_hpp_${brandCode}_last_name">
-                    <span>Last name</span>
+                    <span>
+                        <spring:theme code="payment.method.last.name"/>
+                    </span>
                 </label>
 
                 <input id="p_method_adyen_hpp_${brandCode}_last_name"
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
index b79e5312a..c309cb65b 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
@@ -18,16 +18,18 @@
   ~  This file is open source and available under the MIT license.
   ~  See the LICENSE file for more info.
   --%>
+<%@ attribute name="creditCardLabel" required="true" type="java.lang.String" %>
 <%@ attribute name="showComboCard" required="false" type="java.lang.Boolean" %>
 
 <%@ taglib prefix="adyen" tagdir="/WEB-INF/tags/addons/adyenv6b2ccheckoutaddon/responsive" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <div class="chckt-pm chckt-pm-card js-chckt-pm js-chckt-pm__pm-holder" data-additional-required="" data-pm="card">
     <input type="hidden" name="txvariant" value="card">
     <div class="chckt-pm__header js-chckt-pm__header">
         <adyen:methodSelector name="adyen_cc"/>
-        <span class="chckt-pm__name js-chckt-pm__name">Credit Card</span>
+        <span class="chckt-pm__name js-chckt-pm__name">${creditCardLabel}</span>
         <span class="chckt-pm__image">
             <span id="cardLogos"></span>
             <span class="chckt-pm__image-border"></span>
@@ -38,11 +40,17 @@
         <div class="chckt-form chckt-form--max-width">
             <c:if test="${showComboCard}">
                 <div class="adyen-checkout__dropdown adyen-checkout__field adyen-checkout__input--large">
-                    <label class="adyen-checkout__label__text">Select Credit or Debit Card</label>
+                    <label class="adyen-checkout__label__text">
+                        <spring:theme code="payment.method.cards.combo"/>
+                    </label>
                     <select class="adyen-checkout__dropdown__button chckt-select-box js-chckt-terminal-select-box" id="adyen_combo_card_type"
                             name="${adyen_combo_card_type}">
-                        <option value="credit" label="Credit"/>
-                        <option value="debit" label="Debit"/>
+                        <option value="credit">
+                            <spring:theme code="payment.method.cards.credit"/>
+                        </option>
+                        <option value="debit">
+                            <spring:theme code="payment.method.cards.debit"/>
+                        </option>
                     </select>
                     <span class="clearfix"></span>
                 </div>
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
index 9126fb532..f7195ded4 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
@@ -14,7 +14,9 @@
 <div id="spinner_wrapper" style="display: none">
     <div id="spinner"></div>
     <div id="spinner_text">
-        <p>Please wait while your payment is processed. Do not click back or refresh the page.</p>
+        <p>
+            <spring:theme code="checkout.summary.spinner.message"/>
+        </p>
     </div>
 </div>
 
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
index dedc38e7d..b1b8e2fb1 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
@@ -143,7 +143,9 @@
                             <form:hidden path="componentData"/>
 
                             <%-- Billing Information --%>
-                            <div class="headline"><spring:message text="Billing Information"/></div>
+                            <div class="headline">
+                                <spring:theme code="payment.method.billing.information"/>
+                            </div>
 
                             <c:if test="${cartData.deliveryItemsQuantity > 0}">
                                 <div id="useAdyenDeliveryAddressData"
@@ -170,7 +172,9 @@
 
                             <%-- Billing Information end --%>
 
-                            <div class="headline"><spring:message text="Payment Information"/></div>
+                            <div class="headline">
+                                <spring:theme code="payment.method.payment.information"/>
+                            </div>
 
                             <div class="chckt-pm-list js-chckt-pm-list">
                                 <c:forEach items="${storedCards}" var="storedCard">
@@ -183,6 +187,7 @@
 
                                 <c:if test="${not empty allowedCards}">
                                     <adyen:securedFieldsMethod
+                                            creditCardLabel="${creditCardLabel}"
                                             showComboCard="${showComboCard}"/>
                                 </c:if>
 
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 8a210144c..2dfda9720 100644
--- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
+++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6b2ccheckoutaddon
 releasedate=20170509 1903
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0
diff --git a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenPaypalFacadeTest.java b/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenPaypalFacadeTest.java
deleted file mode 100644
index 7bb1aba84..000000000
--- a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenPaypalFacadeTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.facades;
-
-import java.security.SignatureException;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import com.adyen.v6.factory.AdyenAddressDataFactory;
-import de.hybris.bootstrap.annotations.UnitTest;
-import de.hybris.platform.commercefacades.order.CheckoutFacade;
-import de.hybris.platform.commercefacades.order.data.CartData;
-import de.hybris.platform.commercefacades.user.UserFacade;
-import de.hybris.platform.commercefacades.user.data.AddressData;
-import de.hybris.platform.core.model.order.CartModel;
-import de.hybris.platform.core.model.order.payment.PaymentInfoModel;
-import de.hybris.platform.core.model.user.AddressModel;
-import de.hybris.platform.order.CartService;
-import de.hybris.platform.order.InvalidCartException;
-import de.hybris.platform.servicelayer.dto.converter.Converter;
-import de.hybris.platform.servicelayer.model.ModelService;
-import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT_ERROR;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT_PENDING;
-import static com.adyen.constants.HPPConstants.Response.MERCHANT_REFERENCE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_CITY;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_COUNTRY;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_POSTAL_CODE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_STATE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_STATE_OR_PROVINCE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_BILLING_ADDRESS_STREET;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_CITY;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_COUNTRY;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_POSTAL_CODE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_STATE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_STATE_OR_PROVINCE;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_DELIVERY_ADDRESS_STREET;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_PAYMENT_TOKEN;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_SHOPPER_FIRST_NAME;
-import static com.adyen.v6.facades.AdyenPaypalFacade.PAYPAL_ECS_SHOPPER_LAST_NAME;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@UnitTest
-@RunWith(MockitoJUnitRunner.class)
-public class AdyenPaypalFacadeTest {
-    @Mock
-    private AdyenAddressDataFactory adyenAddressDataFactoryMock;
-
-    @Mock
-    private AdyenCheckoutFacade adyenCheckoutFacadeMock;
-
-    @Mock
-    private ModelService modelServiceMock;
-
-    @Mock
-    private CartService cartServiceMock;
-
-    @Mock
-    private CheckoutFacade checkoutFacadeMock;
-
-    @Mock
-    private UserFacade userFacadeMock;
-
-    @Mock
-    private Converter<AddressData, AddressModel> addressReverseConverterMock;
-
-    @InjectMocks
-    private DefaultAdyenPaypalFacade adyenPaypalFacade;
-
-    @Mock
-    HttpServletRequest requestMock;
-
-    @Mock
-    CartData cartDataMock;
-
-    @Before
-    public void setUp() throws SignatureException, InvalidCartException {
-        when(requestMock.getParameter(MERCHANT_REFERENCE)).thenReturn("code");
-        when(cartDataMock.getCode()).thenReturn("code");
-        when(checkoutFacadeMock.getCheckoutCart()).thenReturn(cartDataMock);
-    }
-
-    @Test
-    public void testHandlePaypalEcsResponse() throws SignatureException, InvalidCartException {
-        //Success
-        when(requestMock.getParameter(AUTH_RESULT)).thenReturn(AUTH_RESULT_PENDING);
-        boolean success = adyenPaypalFacade.handlePaypalECSResponse(requestMock);
-        assertTrue(success);
-
-        //Cancelled
-        when(requestMock.getParameter(AUTH_RESULT)).thenReturn(AUTH_RESULT_ERROR);
-        success = adyenPaypalFacade.handlePaypalECSResponse(requestMock);
-        assertFalse(success);
-    }
-
-    @Test(expected = SignatureException.class)
-    public void testHandlePaypalEcsResponseSignatureException() throws SignatureException, InvalidCartException {
-        doThrow(new SignatureException("")).when(adyenCheckoutFacadeMock).validateHPPResponse(requestMock);
-        adyenPaypalFacade.handlePaypalECSResponse(requestMock);
-        fail("Expected exception");
-    }
-
-    @Test(expected = InvalidCartException.class)
-    public void testHandlePaypalEcsResponseRestoreCartException() throws SignatureException, InvalidCartException {
-        doThrow(new InvalidCartException("")).when(adyenCheckoutFacadeMock).restoreSessionCart();
-            adyenPaypalFacade.handlePaypalECSResponse(requestMock);
-            fail("Expected exception");
-    }
-
-    @Test
-    public void testInitializePaypalEcs() throws SignatureException, InvalidCartException {
-        Map<String, String> hppFormData = adyenPaypalFacade.initializePaypalECS("redirectUrl");
-
-        verify(cartDataMock).setAdyenPaymentMethod(PAYPAL_ECS);
-    }
-
-    @Test
-    public void testUpdateCart() {
-        CartModel cartModelMock = mock(CartModel.class);
-        AddressData deliveryAddressMock = mock(AddressData.class);
-        PaymentInfoModel paymentInfoMock = mock(PaymentInfoModel.class);
-        AddressModel addressModel = new AddressModel();
-
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_COUNTRY)).thenReturn("country");
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STATE)).thenReturn("state");
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STATE_OR_PROVINCE)).thenReturn("stateOrProvince");
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_CITY)).thenReturn("city");
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STREET)).thenReturn("street");
-        when(requestMock.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_POSTAL_CODE)).thenReturn("postalCode");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_COUNTRY)).thenReturn("country");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STATE)).thenReturn("state");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STATE_OR_PROVINCE)).thenReturn("stateOrProvince");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_CITY)).thenReturn("city");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STREET)).thenReturn("street");
-        when(requestMock.getParameter(PAYPAL_ECS_BILLING_ADDRESS_POSTAL_CODE)).thenReturn("postalCode");
-        when(requestMock.getParameter(PAYPAL_ECS_SHOPPER_FIRST_NAME)).thenReturn("firstName");
-        when(requestMock.getParameter(PAYPAL_ECS_SHOPPER_LAST_NAME)).thenReturn("lastName");
-        when(requestMock.getParameter(PAYPAL_ECS_PAYMENT_TOKEN)).thenReturn("paymentToken");
-
-        when(adyenAddressDataFactoryMock.createAddressData("country", "state", "stateOrProvince", "city", "street", "postalCode", "firstName", "lastName")).thenReturn(deliveryAddressMock);
-
-        when(cartServiceMock.getSessionCart()).thenReturn(cartModelMock);
-        when(modelServiceMock.create(PaymentInfoModel.class)).thenReturn(paymentInfoMock);
-        when(modelServiceMock.create(AddressModel.class)).thenReturn(addressModel);
-
-        adyenPaypalFacade.updateCart(requestMock, false);
-
-        verify(checkoutFacadeMock).setDeliveryAddress(deliveryAddressMock);
-        verify(paymentInfoMock).setAdyenPaymentMethod(PAYPAL_ECS);
-        verify(paymentInfoMock).setAdyenPaypalEcsToken("paymentToken");
-        verify(modelServiceMock).save(paymentInfoMock);
-    }
-}
diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
index 3b74231a2..35509c519 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
+++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
@@ -24,9 +24,10 @@
 				<editorArea:section name="hmc.adyen.account">
 					<editorArea:attribute qualifier="adyenMerchantAccount"/>
 					<editorArea:attribute qualifier="adyenImmediateCapture"/>
-					<editorArea:attribute qualifier="adyenAllowedCards"/>
 					<editorArea:attribute qualifier="adyenRecurringContractMode"/>
 					<editorArea:attribute qualifier="adyenTestMode"/>
+					<editorArea:attribute qualifier="adyenGuestUserTokenization"/>
+					<editorArea:attribute qualifier="adyenAllowedCards"/>
 				</editorArea:section>
 				<editorArea:section name="hmc.adyen.api">
 					<editorArea:attribute qualifier="adyenAPIEndpointPrefix"/>
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 3efdaafbf..75db5c423 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice.build.number
+++ b/adyenv6backoffice/resources/adyenv6backoffice.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6backoffice
 releasedate=20170509 1903
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0
diff --git a/adyenv6core/resources/adyenv6core-beans.xml b/adyenv6core/resources/adyenv6core-beans.xml
index 5588a3d97..202e2df64 100644
--- a/adyenv6core/resources/adyenv6core-beans.xml
+++ b/adyenv6core/resources/adyenv6core-beans.xml
@@ -34,7 +34,6 @@
         <property name="adyenFirstName" type="java.lang.String"/>
         <property name="adyenInstallments" type="java.lang.Integer"/>
         <property name="adyenLastName" type="java.lang.String"/>
-        <property name="adyenPaymentToken" type="java.lang.String"/>
         <property name="adyenReturnUrl" type="java.lang.String"/>
         <property name="adyenTerminalId" type="java.lang.String"/>
         <property name="adyenBrowserInfo" type="java.lang.String"/>
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index 3aeadc694..d60ac5846 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -189,6 +189,12 @@
                     <modifiers optional="false"/>
                     <defaultvalue>Boolean.TRUE</defaultvalue>
                 </attribute>
+                <attribute qualifier="adyenGuestUserTokenization" type="java.lang.boolean">
+                    <description>Enable guest checkout tokenization</description>
+                    <persistence type="property"/>
+                    <modifiers optional="false"/>
+                    <defaultvalue>Boolean.FALSE</defaultvalue>
+                </attribute>
                 <attribute qualifier="adyenAPIEndpointPrefix" type="java.lang.String">
                     <description>API endpoint URL Prefix for Live</description>
                     <persistence type="property"/>
@@ -399,18 +405,6 @@
                         </columntype>
                     </persistence>
                 </attribute>
-                <attribute qualifier="adyenPaypalEcsToken" type="java.lang.String">
-                    <description>Paypal ECS payment token</description>
-                    <persistence type="property">
-                        <columntype>
-                            <value>HYBRIS.LONG_STRING</value>
-                        </columntype>
-                    </persistence>
-                </attribute>
-                <attribute qualifier="adyenPaypalPayerId" type="java.lang.String">
-                    <description>Paypal ECS payer ID</description>
-                    <persistence type="property"/>
-                </attribute>
                 <attribute qualifier="encryptedCardNumber" type="java.lang.String">
                     <description>Adyen Encrypted Card Number</description>
                     <persistence type="property">
diff --git a/adyenv6core/resources/adyenv6core-spring.xml b/adyenv6core/resources/adyenv6core-spring.xml
index 3dc70a28c..398b43606 100644
--- a/adyenv6core/resources/adyenv6core-spring.xml
+++ b/adyenv6core/resources/adyenv6core-spring.xml
@@ -138,12 +138,6 @@
     <bean id="adyenPosPaymentResponseConverter" class="com.adyen.v6.converters.PosPaymentResponseConverter" />
 
 
-    <alias name="defaultAdyenAddressDataFactory" alias="adyenAddressDataFactory"/>
-    <bean id="defaultAdyenAddressDataFactory" class="com.adyen.v6.factory.DefaultAdyenAddressDataFactory">
-        <property name="modelService" ref="modelService" />
-        <property name="commonI18NService" ref="commonI18NService" />
-    </bean>
-
     <alias name="defaultAdyenNotificationService" alias="adyenNotificationService"/>
     <bean id="defaultAdyenNotificationService" class="com.adyen.v6.service.DefaultAdyenNotificationService">
         <property name="modelService" ref="modelService" />
@@ -218,17 +212,6 @@
         <property name="adyenBusinessProcessService" ref="adyenBusinessProcessService" />
     </bean>
 
-    <alias name="defaultAdyenPaypalFacade" alias="adyenPaypalFacade" />
-    <bean id="defaultAdyenPaypalFacade" class="com.adyen.v6.facades.DefaultAdyenPaypalFacade">
-        <property name="adyenAddressDataFactory" ref="adyenAddressDataFactory"/>
-        <property name="adyenCheckoutFacade" ref="adyenCheckoutFacade"/>
-        <property name="modelService" ref="modelService"/>
-        <property name="cartService" ref="cartService"/>
-        <property name="checkoutFacade" ref="checkoutFacade"/>
-        <property name="userFacade" ref="userFacade"/>
-        <property name="addressReverseConverter" ref="addressReverseConverter"/>
-    </bean>
-
     <bean name="adyenAbstractOrderPopulator" class="com.adyen.v6.populator.AbstractOrderPopulator">
         <property name="addressConverter" ref="addressConverter"/>
     </bean>
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index 662dc5e81..506091f6d 100644
--- a/adyenv6core/resources/adyenv6core.build.number
+++ b/adyenv6core/resources/adyenv6core.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6core
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
index 05ab04212..515734348 100644
--- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties
+++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -38,6 +38,9 @@ type.basestore.adyenAllowedCards.name=Allowed Credit Card Types
 type.basestore.adyenAllowedCards.description=Select which Credit Card Types you want to allow in the checkout form. These Credit Card Types must be enabled in Adyen Customer Area.
 type.basestore.adyenRecurringContractMode.name=Recurring contract type
 type.basestore.adyenRecurringContractMode.description=How the payment will be stored on Adyen
+type.basestore.adyenGuestUserTokenization.name=Enable Guest Checkout Tokenization
+type.basestore.adyenGuestUserTokenization.description=Enables tokenization of card payment details of guest users.
+
 type.basestore.adyenBoleto.name=Enable Boleto
 type.basestore.adyenBoleto.description=Enables Boleto as an available payment method when delivery country is Brasil and currency is BRL. Requires Web Service User configuration.
 type.basestore.adyenPosEnabled.name=Enable POS
@@ -70,8 +73,6 @@ type.paymentinfo.adyenBoletoUrl.name=Boleto URL
 type.paymentinfo.adyenBoletoExpirationDate.name=Boleto Expiration Date
 type.paymentinfo.adyenBoletoBarCodeReference.name=Boleto Barcode Reference
 type.paymentinfo.adyenBoletoDueDate.name=Boleto Duedate
-type.paymentinfo.adyenPaypalEcsToken.name=Paypal ECS payment token
-type.paymentinfo.adyenPaypalPayerId.name=Paypal ECS payer ID
 
 type.paymentinfo.adyenInstallments.name=Installments
 type.paymentinfo.cardBrand.name=Card Brand
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index a48f32ffc..daa4b1e4b 100644
--- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
+++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
@@ -31,7 +31,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String EXTENSIONNAME = "adyenv6core";
 
 	public static final String PLUGIN_NAME = "adyen-hybris";
-	public static final String PLUGIN_VERSION = "7.0.0";
+	public static final String PLUGIN_VERSION = "7.1.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 
@@ -45,6 +45,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	final public static String PAYMENT_METHOD_MULTIBANCO = "multibanco";
 	final public static String PAYMENT_METHOD_POS = "pos";
 	final public static String PAYMENT_METHOD_PAYPAL = "paypal";
+	final public static String PAYMENT_METHOD_SCHEME = "scheme";
 
 	public static final String PROCESS_EVENT_ADYEN_CAPTURED = "AdyenCaptured";
 	public static final String PROCESS_EVENT_ADYEN_PAYMENT_RESULT = "AdyenPaymentResult";
@@ -61,6 +62,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	//Prefix for Oney methods like facilpay_3x or facilpay_4x
 	public static final String PAYMENT_METHOD_FACILPAY_PREFIX = "facilypay";
 	public static final String CARD_TYPE_DEBIT = "debit";
+	public static final String AFFIRM = "affirm";
 
 	private Adyenv6coreConstants() {
 		//empty to avoid instantiating this constant class
@@ -74,7 +76,7 @@ private Adyenv6coreConstants() {
 		add(KLARNA);
 		add(RATEPAY);
 		add(KLARNA_SLICE);
-
+		add(AFFIRM);
 //		add(AFTERPAY); // not supported yet
 	}});
 
diff --git a/adyenv6core/src/com/adyen/v6/facades/AdyenPaypalFacade.java b/adyenv6core/src/com/adyen/v6/facades/AdyenPaypalFacade.java
deleted file mode 100644
index 8639a55e4..000000000
--- a/adyenv6core/src/com/adyen/v6/facades/AdyenPaypalFacade.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.facades;
-
-import java.security.SignatureException;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import de.hybris.platform.order.InvalidCartException;
-
-/**
- * Facade for initiating Paypal Express Checkout Shortcut transactions
- */
-public interface AdyenPaypalFacade {
-    String PAYPAL_ECS_CARD_HOLDER_NAME = "card.holderName";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_STATE = "deliveryAddress.state";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_CITY = "deliveryAddress.city";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_STATE_OR_PROVINCE = "deliveryAddress.stateOrProvince";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_POSTAL_CODE = "deliveryAddress.postalCode";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_STREET = "deliveryAddress.street";
-    String PAYPAL_ECS_DELIVERY_ADDRESS_COUNTRY = "deliveryAddress.country";
-    String PAYPAL_ECS_SHOPPER_EMAIL = "shopperEmail";
-    String PAYPAL_ECS_SHOPPER_FIRST_NAME = "shopper.firstName";
-    String PAYPAL_ECS_SHOPPER_LAST_NAME = "shopper.lastName";
-    String PAYPAL_ECS_SHOPPER_PHONE_NUMBER = "shopper.telephoneNumber";
-    String PAYPAL_ECS_BILLING_ADDRESS_STATE_OR_PROVINCE = "billingAddress.stateOrProvince";
-    String PAYPAL_ECS_BILLING_ADDRESS_POSTAL_CODE = "billingAddress.postalCode";
-    String PAYPAL_ECS_BILLING_ADDRESS_STATE = "billingAddress.state";
-    String PAYPAL_ECS_BILLING_ADDRESS_STREET = "billingAddress.street";
-    String PAYPAL_ECS_BILLING_ADDRESS_CITY = "billingAddress.city";
-    String PAYPAL_ECS_BILLING_ADDRESS_COUNTRY = "billingAddress.country";
-    String PAYPAL_ECS_PAYMENT_TOKEN = "payment.token";
-    String PAYPAL_ECS_PAYMENT_PAYER_ID = "payment.payerid";
-
-    /**
-     * Validates Paypal ECS response
-     * Restores locked cart
-     *
-     * @param request HTTP request object
-     * @return true when the Paypal authorization succeeded
-     * @throws SignatureException   In case of wrong HPP signature
-     * @throws InvalidCartException In case cart cannot be restored
-     */
-    boolean handlePaypalECSResponse(HttpServletRequest request) throws SignatureException, InvalidCartException;
-
-    /**
-     * Updates the session cart with data coming from Paypal response
-     *
-     * @param request HTTP request
-     * @param updateExistingDeliveryAddress Overwrite delivery address if it is already set
-     */
-    void updateCart(HttpServletRequest request, boolean updateExistingDeliveryAddress);
-
-    /**
-     * Initializes Paypal ECS payment
-     * Locks session cart
-     *
-     * @param redirectUrl URL to redirect after
-     * @return HPP key/value pairs
-     * @throws SignatureException   In case of wrong HPP signature
-     * @throws InvalidCartException In case there is an existing locked cart
-     */
-    Map<String, String> initializePaypalECS(String redirectUrl) throws SignatureException, InvalidCartException;
-}
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 7f9a9a4b2..82d5f24ef 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -41,6 +41,7 @@
 import com.adyen.v6.constants.Adyenv6coreConstants;
 import com.adyen.v6.converters.PaymentsResponseConverter;
 import com.adyen.v6.converters.PosPaymentResponseConverter;
+import com.adyen.v6.enums.AdyenCardTypeEnum;
 import com.adyen.v6.enums.RecurringContractMode;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
 import com.adyen.v6.factory.AdyenPaymentServiceFactory;
@@ -67,6 +68,7 @@
 import de.hybris.platform.commercefacades.user.data.AddressData;
 import de.hybris.platform.commercefacades.user.data.CountryData;
 import de.hybris.platform.commercefacades.user.data.RegionData;
+import de.hybris.platform.commerceservices.enums.CustomerType;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
 import de.hybris.platform.commercewebservicescommons.dto.order.PaymentDetailsListWsDTO;
 import de.hybris.platform.commercewebservicescommons.dto.order.PaymentDetailsWsDTO;
@@ -125,7 +127,6 @@
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.FINGERPRINT_RESULT;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_CHALLENGE_TOKEN;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_FINGERPRINT_TOKEN;
-import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
 import static com.adyen.constants.HPPConstants.Fields.BRAND_CODE;
 import static com.adyen.constants.HPPConstants.Fields.COUNTRY_CODE;
 import static com.adyen.constants.HPPConstants.Fields.CURRENCY_CODE;
@@ -148,6 +149,7 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_SCHEME;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_SEPA_DIRECTDEBIT;
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
 import static de.hybris.platform.order.impl.DefaultCartService.SESSION_CART_PARAMETER_NAME;
@@ -201,6 +203,7 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     public static final String SESSION_PAYMENT_DATA = "adyen_payment_data";
     public static final String MODEL_SELECTED_PAYMENT_METHOD = "selectedPaymentMethod";
     public static final String MODEL_PAYMENT_METHODS = "paymentMethods";
+    public static final String MODEL_CREDIT_CARD_LABEL = "creditCardLabel";
     public static final String MODEL_ALLOWED_CARDS = "allowedCards";
     public static final String MODEL_REMEMBER_DETAILS = "showRememberTheseDetails";
     public static final String MODEL_STORED_CARDS = "storedCards";
@@ -449,15 +452,16 @@ private void updateOrderPaymentStatusAndInfo(OrderModel orderModel, PaymentsResp
 
     @Override
     public OrderData authorisePayment(final HttpServletRequest request, final CartData cartData) throws Exception {
+        CheckoutCustomerStrategy checkoutCustomerStrategy = getCheckoutCustomerStrategy();
         CustomerModel customer = null;
-        if (! getCheckoutCustomerStrategy().isAnonymousCheckout()) {
-            customer = getCheckoutCustomerStrategy().getCurrentUserForCheckout();
+        if (! checkoutCustomerStrategy.isAnonymousCheckout()) {
+            customer = checkoutCustomerStrategy.getCurrentUserForCheckout();
         }
 
         updateCartWithSessionData(cartData);
         String adyenPaymentMethod = cartData.getAdyenPaymentMethod();
 
-        if (adyenPaymentMethod.equals(PAYPAL_ECS) || adyenPaymentMethod.startsWith(RATEPAY)) {
+        if (adyenPaymentMethod.startsWith(RATEPAY)) {
 
             PaymentResult paymentResult = getAdyenPaymentService().authorise(cartData, request, customer);
             if (PaymentResult.ResultCodeEnum.AUTHORISED == paymentResult.getResultCode()) {
@@ -471,7 +475,10 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
 
         RequestInfo requestInfo = new RequestInfo(request);
         requestInfo.setShopperLocale(getShopperLocale());
-
+        if (customer == null && isGuestUserTokenizationEnabled()) {
+            customer = checkoutCustomerStrategy.getCurrentUserForCheckout();
+            customer.setType(CustomerType.GUEST);
+        }
         PaymentsResponse paymentsResponse = getAdyenPaymentService().authorisePayment(cartData, requestInfo, customer);
         PaymentsResponse.ResultCodeEnum resultCode = paymentsResponse.getResultCode();
         if (PaymentsResponse.ResultCodeEnum.AUTHORISED == resultCode) {
@@ -512,6 +519,15 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
         throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
     }
 
+    private boolean isGuestUserTokenizationEnabled() {
+        Boolean guestCheckoutFlag = baseStoreService.getCurrentBaseStore().getAdyenGuestUserTokenization();
+        if (guestCheckoutFlag == null) {
+            return false;
+        } else {
+            return guestCheckoutFlag;
+        }
+    }
+
     @Override
     public PaymentsResponse componentPayment(final HttpServletRequest request, final CartData cartData, final PaymentMethodDetails paymentMethodDetails) throws Exception {
         CustomerModel customer = null;
@@ -569,14 +585,8 @@ public OrderData handle3DResponse(final HttpServletRequest request) throws Excep
         String paRes = request.getParameter(THREE_D_PARES);
         String md = request.getParameter(THREE_D_MD);
 
-        String sessionMd = getSessionService().getAttribute(SESSION_MD);
         String sessionPaymentData = getSessionService().getAttribute(SESSION_PAYMENT_DATA);
 
-        //Check if MD matches in order to avoid authorizing wrong order
-        if (sessionMd != null && ! sessionMd.equals(md)) {
-            throw new SignatureException("MD does not match!");
-        }
-
         PaymentsResponse paymentsResponse;
         try {
             paymentsResponse = getAdyenPaymentService().authorise3DPayment(sessionPaymentData, paRes, md);
@@ -631,7 +641,12 @@ public OrderData handle3DS2Response(final HttpServletRequest request) throws Exc
 
         PaymentsResponse.ResultCodeEnum resultCode = paymentsResponse.getResultCode();
 
-        if (resultCode != PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER && resultCode != PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER) {
+        if(resultCode == PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER) {
+            //3DS1 fallback, update payment data
+            getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
+        }
+        else if (resultCode != PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER
+                && resultCode != PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER) {
             String orderCode = paymentsResponse.getMerchantReference();
             OrderModel orderModel = retrievePendingOrder(orderCode);
             updateOrderPaymentStatusAndInfo(orderModel, paymentsResponse);
@@ -835,19 +850,37 @@ public void initializeCheckoutData(Model model) {
 
         Optional<PaymentMethod> sepaDirectDebit = alternativePaymentMethods.stream().
                                                                             filter(paymentMethod -> ! paymentMethod.getType().isEmpty() &&
-                                                                                    PAYMENT_METHOD_SEPA_DIRECTDEBIT.contains(paymentMethod.getType())).findFirst()
-                ;
+                                                                                    PAYMENT_METHOD_SEPA_DIRECTDEBIT.contains(paymentMethod.getType())).findFirst();
+
         if(sepaDirectDebit.isPresent())
         {
             model.addAttribute(PAYMENT_METHOD_SEPA_DIRECTDEBIT, true);
         }
 
+        baseStore = baseStoreService.getCurrentBaseStore();
+
+        //Verify allowedCards
+        String creditCardLabel = null;
+        Set<AdyenCardTypeEnum> allowedCards = null;
+        PaymentMethod cardsPaymentMethod = alternativePaymentMethods.stream()
+                                                                    .filter(paymentMethod -> PAYMENT_METHOD_SCHEME.equals(paymentMethod.getType()))
+                                                                    .findAny().orElse(null);
+
+        if (cardsPaymentMethod != null) {
+            creditCardLabel = cardsPaymentMethod.getName();
+            allowedCards = baseStore.getAdyenAllowedCards();
+
+            List<String> cardBrands = cardsPaymentMethod.getBrands();
+            allowedCards = allowedCards.stream()
+                                       .filter(adyenCardTypeEnum -> cardBrands.contains(adyenCardTypeEnum.getCode()))
+                                       .collect(Collectors.toSet());
+        }
+
         //Exclude cards, boleto, bcmc and bcmc_mobile_QR and iDeal
         alternativePaymentMethods = alternativePaymentMethods.stream()
                                                              .filter(paymentMethod -> ! paymentMethod.getType().isEmpty() && ! isHiddenPaymentMethod(paymentMethod))
                                                              .collect(Collectors.toList());
 
-        baseStore = baseStoreService.getCurrentBaseStore();
         if (showRememberDetails()) {
             //Include stored cards
             storedPaymentMethodList = response.getStoredPaymentMethods();
@@ -868,7 +901,8 @@ public void initializeCheckoutData(Model model) {
         model.addAttribute(MODEL_PAYMENT_METHODS, alternativePaymentMethods);
 
         //Set allowed Credit Cards
-        model.addAttribute(MODEL_ALLOWED_CARDS, baseStore.getAdyenAllowedCards());
+        model.addAttribute(MODEL_CREDIT_CARD_LABEL, creditCardLabel);
+        model.addAttribute(MODEL_ALLOWED_CARDS, allowedCards);
 
         model.addAttribute(MODEL_REMEMBER_DETAILS, showRememberDetails());
         model.addAttribute(MODEL_STORED_CARDS, storedPaymentMethodList);
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenPaypalFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenPaypalFacade.java
deleted file mode 100644
index e455802e6..000000000
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenPaypalFacade.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.facades;
-
-import java.security.SignatureException;
-import java.util.Map;
-import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
-import com.adyen.v6.factory.AdyenAddressDataFactory;
-import de.hybris.platform.commercefacades.order.CheckoutFacade;
-import de.hybris.platform.commercefacades.order.data.CartData;
-import de.hybris.platform.commercefacades.user.UserFacade;
-import de.hybris.platform.commercefacades.user.data.AddressData;
-import de.hybris.platform.core.model.order.CartModel;
-import de.hybris.platform.core.model.order.payment.PaymentInfoModel;
-import de.hybris.platform.core.model.user.AddressModel;
-import de.hybris.platform.order.CartService;
-import de.hybris.platform.order.InvalidCartException;
-import de.hybris.platform.servicelayer.dto.converter.Converter;
-import de.hybris.platform.servicelayer.model.ModelService;
-import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT_AUTHORISED;
-import static com.adyen.constants.HPPConstants.Response.AUTH_RESULT_PENDING;
-import static com.adyen.constants.HPPConstants.Response.MERCHANT_REFERENCE;
-
-public class DefaultAdyenPaypalFacade implements AdyenPaypalFacade {
-    private AdyenAddressDataFactory adyenAddressDataFactory;
-    private AdyenCheckoutFacade adyenCheckoutFacade;
-    private ModelService modelService;
-    private CartService cartService;
-    private CheckoutFacade checkoutFacade;
-    private UserFacade userFacade;
-    private Converter<AddressData, AddressModel> addressReverseConverter;
-
-    private static final Logger LOG = Logger.getLogger(DefaultAdyenPaypalFacade.class);
-
-    public PaymentInfoModel createPaymentInfo(CartModel cartModel, final HttpServletRequest request) {
-        final PaymentInfoModel paymentInfo = modelService.create(PaymentInfoModel.class);
-        paymentInfo.setUser(cartModel.getUser());
-        paymentInfo.setSaved(false);
-        paymentInfo.setCode(cartModel.getCode() + "_" + UUID.randomUUID());
-
-        //Set billing address
-        AddressData billingAddressData = adyenAddressDataFactory.createAddressData(request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_COUNTRY),
-                                                                                   request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STATE),
-                                                                                   request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STATE_OR_PROVINCE),
-                                                                                   request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_CITY),
-                                                                                   request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_STREET),
-                                                                                   request.getParameter(PAYPAL_ECS_BILLING_ADDRESS_POSTAL_CODE),
-                                                                                   request.getParameter(PAYPAL_ECS_SHOPPER_FIRST_NAME),
-                                                                                   request.getParameter(PAYPAL_ECS_SHOPPER_LAST_NAME));
-
-        AddressModel billingAddressModel = getModelService().create(AddressModel.class);
-        getAddressReverseConverter().convert(billingAddressData, billingAddressModel);
-
-        billingAddressModel.setBillingAddress(true);
-        billingAddressModel.setOwner(paymentInfo);
-        paymentInfo.setBillingAddress(billingAddressModel);
-
-        //Add PP ECS data to the payment info
-        paymentInfo.setAdyenPaymentMethod(PAYPAL_ECS);
-        paymentInfo.setAdyenPaypalPayerId(request.getParameter(PAYPAL_ECS_PAYMENT_PAYER_ID));
-        paymentInfo.setAdyenPaypalEcsToken(request.getParameter(PAYPAL_ECS_PAYMENT_TOKEN));
-
-        return paymentInfo;
-    }
-
-    @Override
-    public boolean handlePaypalECSResponse(final HttpServletRequest request) throws SignatureException, InvalidCartException {
-        //Validate merchant signature
-        adyenCheckoutFacade.validateHPPResponse(request);
-
-        adyenCheckoutFacade.restoreSessionCart();
-
-        //Validate merchant reference
-        String merchantReference = request.getParameter(MERCHANT_REFERENCE);
-        CartData cartData = getCheckoutFacade().getCheckoutCart();
-        if (! cartData.getCode().equals(merchantReference)) {
-            throw new InvalidCartException("Merchant reference doesn't match cart's code");
-        }
-
-        //Return true for Authorised or Pending result
-        String authResult = request.getParameter(AUTH_RESULT);
-        return AUTH_RESULT_PENDING.equals(authResult) || AUTH_RESULT_AUTHORISED.equals(authResult);
-    }
-
-    @Override
-    public void updateCart(final HttpServletRequest request, final boolean updateExistingDeliveryAddress) {
-        CartData cartData = checkoutFacade.getCheckoutCart();
-        if (cartData == null) {
-            return;
-        }
-
-        //Create a delivery address from PP response
-        if (updateExistingDeliveryAddress || cartData.getDeliveryAddress() == null) {
-            final AddressData deliveryAddress = adyenAddressDataFactory.createAddressData(request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_COUNTRY),
-                                                                                          request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STATE),
-                                                                                          request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STATE_OR_PROVINCE),
-                                                                                          request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_CITY),
-                                                                                          request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_STREET),
-                                                                                          request.getParameter(PAYPAL_ECS_DELIVERY_ADDRESS_POSTAL_CODE),
-                                                                                          request.getParameter(PAYPAL_ECS_SHOPPER_FIRST_NAME),
-                                                                                          request.getParameter(PAYPAL_ECS_SHOPPER_LAST_NAME));
-
-            deliveryAddress.setShippingAddress(true);
-            userFacade.addAddress(deliveryAddress);
-            checkoutFacade.setDeliveryAddress(deliveryAddress);
-
-            LOG.debug("setting delivery address for " + cartService.getSessionCart().getCode());
-        }
-
-        //Generating payment info
-        CartModel cartModel = getCartService().getSessionCart();
-        PaymentInfoModel paymentInfo = createPaymentInfo(cartModel, request);
-        modelService.save(paymentInfo);
-        cartModel.setPaymentInfo(paymentInfo);
-
-        cartService.saveOrder(cartService.getSessionCart());
-    }
-
-    @Override
-    public Map<String, String> initializePaypalECS(final String redirectUrl) throws SignatureException, InvalidCartException {
-        CartData cartData = checkoutFacade.getCheckoutCart();
-
-        cartData.setAdyenPaymentMethod(PAYPAL_ECS);
-        cartData.setAdyenIssuerId(null);
-
-        return adyenCheckoutFacade.initializeHostedPayment(cartData, redirectUrl);
-    }
-
-    public AdyenAddressDataFactory getAdyenAddressDataFactory() {
-        return adyenAddressDataFactory;
-    }
-
-    public void setAdyenAddressDataFactory(AdyenAddressDataFactory adyenAddressDataFactory) {
-        this.adyenAddressDataFactory = adyenAddressDataFactory;
-    }
-
-    public AdyenCheckoutFacade getAdyenCheckoutFacade() {
-        return adyenCheckoutFacade;
-    }
-
-    public void setAdyenCheckoutFacade(AdyenCheckoutFacade adyenCheckoutFacade) {
-        this.adyenCheckoutFacade = adyenCheckoutFacade;
-    }
-
-    public ModelService getModelService() {
-        return modelService;
-    }
-
-    public void setModelService(ModelService modelService) {
-        this.modelService = modelService;
-    }
-
-    public CartService getCartService() {
-        return cartService;
-    }
-
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
-    public CheckoutFacade getCheckoutFacade() {
-        return checkoutFacade;
-    }
-
-    public void setCheckoutFacade(CheckoutFacade checkoutFacade) {
-        this.checkoutFacade = checkoutFacade;
-    }
-
-    public UserFacade getUserFacade() {
-        return userFacade;
-    }
-
-    public void setUserFacade(UserFacade userFacade) {
-        this.userFacade = userFacade;
-    }
-
-    public Converter<AddressData, AddressModel> getAddressReverseConverter() {
-        return addressReverseConverter;
-    }
-
-    public void setAddressReverseConverter(Converter<AddressData, AddressModel> addressReverseConverter) {
-        this.addressReverseConverter = addressReverseConverter;
-    }
-}
\ No newline at end of file
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenAddressDataFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenAddressDataFactory.java
deleted file mode 100644
index f24ff52f0..000000000
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenAddressDataFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.factory;
-
-import de.hybris.platform.commercefacades.user.data.AddressData;
-
-public interface AdyenAddressDataFactory {
-    /**
-     * Factory Method for providing AddressData
-     * @param country country
-     * @param state state
-     * @param stateOrProvince state or province
-     * @param city city
-     * @param street street
-     * @param postalCode postal code
-     * @param firstName first name
-     * @param lastName last name
-     * @return AddressData
-     */
-    AddressData createAddressData(String country, String state, String stateOrProvince, String city, String street, String postalCode, String firstName, String lastName);
-}
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
index 324ef36ac..a5b8278d5 100644
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
+++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -64,12 +64,14 @@
 import de.hybris.platform.commercefacades.order.data.OrderEntryData;
 import de.hybris.platform.commercefacades.user.data.AddressData;
 import de.hybris.platform.commercefacades.user.data.CountryData;
+import de.hybris.platform.commerceservices.enums.CustomerType;
 import de.hybris.platform.core.model.user.CustomerModel;
 import de.hybris.platform.servicelayer.config.ConfigurationService;
 import de.hybris.platform.util.TaxValue;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.datatype.DatatypeFactory;
@@ -81,7 +83,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.CARD_TYPE_DEBIT;
 import static com.adyen.v6.constants.Adyenv6coreConstants.ISSUER_PAYMENT_METHODS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
@@ -158,12 +159,6 @@ public PaymentRequest createAuthorizationRequest(final String merchantAccount,
 
             paymentRequest.setShopperName(getShopperNameFromAddress(cartData.getDeliveryAddress()));
         }
-
-        //Set Paypal Express Checkout Shortcut parameters
-        if (PAYPAL_ECS.equals(cartData.getAdyenPaymentMethod())) {
-            setPaypalEcsData(paymentRequest, cartData);
-        }
-
         return paymentRequest;
     }
 
@@ -213,6 +208,9 @@ public PaymentsRequest createPaymentsRequest(final String merchantAccount,
             if (is3DS2allowed) {
                 paymentsRequest = enhanceForThreeDS2(paymentsRequest, cartData);
             }
+            if (customerModel!=null && customerModel.getType() == CustomerType.GUEST) {
+                paymentsRequest.setEnableOneClick(false);
+            }
         }
         //For one click
         else if (adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
@@ -245,6 +243,9 @@ else if (PAYMENT_METHOD_SEPA_DIRECTDEBIT.equals(cartData.getAdyenPaymentMethod()
 
         ApplicationInfo applicationInfo = updateApplicationInfoEcom(paymentsRequest.getApplicationInfo());
         paymentsRequest.setApplicationInfo(applicationInfo);
+        paymentsRequest.setReturnUrl(cartData.getAdyenReturnUrl());
+        paymentsRequest.setRedirectFromIssuerMethod(RequestMethod.GET.toString());
+        paymentsRequest.setRedirectToIssuerMethod(RequestMethod.POST.toString());
         return paymentsRequest;
     }
 
@@ -440,8 +441,10 @@ private void updatePaymentRequestForAlternateMethod(PaymentsRequest paymentsRequ
         paymentsRequest.setReturnUrl(cartData.getAdyenReturnUrl());
         if (ISSUER_PAYMENT_METHODS.contains(adyenPaymentMethod)) {
             paymentMethod.setIssuer(cartData.getAdyenIssuerId());
-        } else if (adyenPaymentMethod.startsWith(KLARNA)||adyenPaymentMethod.startsWith(PAYMENT_METHOD_FACILPAY_PREFIX)) {
-            setOpenInvoiceData(paymentsRequest, cartData, customerModel);
+        } else if (adyenPaymentMethod.startsWith(KLARNA)
+                || adyenPaymentMethod.startsWith(PAYMENT_METHOD_FACILPAY_PREFIX)
+                || OPENINVOICE_METHODS_API.contains(adyenPaymentMethod)) {
+            setOpenInvoiceData(paymentsRequest, cartData);
         } else if (adyenPaymentMethod.equals(PAYMENT_METHOD_PAYPAL) && cartData.getDeliveryAddress() != null) {
             Name shopperName = getShopperNameFromAddress(cartData.getDeliveryAddress());
             paymentsRequest.setShopperName(shopperName);
@@ -806,7 +809,7 @@ public void setOpenInvoiceData(PaymentRequest paymentRequest, CartData cartData,
     /*
      * Set the required fields for using the OpenInvoice API
      */
-    public void setOpenInvoiceData(PaymentsRequest paymentsRequest, CartData cartData, final CustomerModel customerModel) {
+    public void setOpenInvoiceData(PaymentsRequest paymentsRequest, CartData cartData) {
         paymentsRequest.setShopperName(getShopperNameFromAddress(cartData.getDeliveryAddress()));
 
         // set date of birth
@@ -929,14 +932,6 @@ private void setBoletoData(PaymentsRequest paymentsRequest, CartData cartData) {
         }
     }
 
-    /**
-     * Set Paypal ECS request data
-     */
-    private void setPaypalEcsData(PaymentRequest paymentRequest, CartData cartData) {
-        paymentRequest.selectedBrand(PAYPAL_ECS);
-        paymentRequest.setPaymentToken(cartData.getAdyenPaymentToken());
-    }
-
     private void setSepaDirectDebitData(PaymentsRequest paymentRequest, CartData cartData) {
         DefaultPaymentMethodDetails paymentMethodDetails = new DefaultPaymentMethodDetails();
         paymentMethodDetails.setSepaOwnerName(cartData.getAdyenSepaOwnerName());
diff --git a/adyenv6core/src/com/adyen/v6/factory/DefaultAdyenAddressDataFactory.java b/adyenv6core/src/com/adyen/v6/factory/DefaultAdyenAddressDataFactory.java
deleted file mode 100644
index 97ff2b142..000000000
--- a/adyenv6core/src/com/adyen/v6/factory/DefaultAdyenAddressDataFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  Adyen Hybris Extension
- *
- *  Copyright (c) 2017 Adyen B.V.
- *  This file is open source and available under the MIT license.
- *  See the LICENSE file for more info.
- */
-package com.adyen.v6.factory;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import de.hybris.platform.commercefacades.user.data.AddressData;
-import de.hybris.platform.commercefacades.user.data.CountryData;
-import de.hybris.platform.commercefacades.user.data.RegionData;
-import de.hybris.platform.core.model.c2l.CountryModel;
-import de.hybris.platform.core.model.c2l.RegionModel;
-import de.hybris.platform.servicelayer.exceptions.UnknownIdentifierException;
-import de.hybris.platform.servicelayer.i18n.CommonI18NService;
-import de.hybris.platform.servicelayer.model.ModelService;
-
-public class DefaultAdyenAddressDataFactory implements AdyenAddressDataFactory {
-    private ModelService modelService;
-    private CommonI18NService commonI18NService;
-
-    private static final Logger LOG = Logger.getLogger(DefaultAdyenAddressDataFactory.class);
-
-    @Override
-    public AddressData createAddressData(String country, String state, String stateOrProvince, String city, String street, String postalCode, String firstName, String lastName) {
-        AddressData addressData = new AddressData();
-
-        addressData.setFirstName(firstName);
-        addressData.setLastName(lastName);
-        addressData.setLine1(street);
-        addressData.setPostalCode(postalCode);
-        addressData.setTown(city);
-        addressData.setVisibleInAddressBook(false);
-        addressData.setDefaultAddress(false);
-
-        //Find country by iso code
-        if (StringUtils.isNotBlank(country)) {
-            final CountryData countryData = new CountryData();
-            countryData.setIsocode(country);
-            addressData.setCountry(countryData);
-        }
-
-        //Find Region/state
-        if (StringUtils.isNotBlank(stateOrProvince) && StringUtils.isNotBlank(country)) {
-            final RegionData regionData = new RegionData();
-            final CountryModel countryModel = commonI18NService.getCountry(country);
-            final String isocode = country.concat("-").concat(stateOrProvince);
-            try {
-                final RegionModel regionModel = commonI18NService.getRegion(countryModel, isocode);
-
-                regionData.setIsocode(regionModel.getIsocode());
-                addressData.setRegion(regionData);
-            } catch (final UnknownIdentifierException e) {
-                LOG.info("No region with the code " + isocode + " found.", e);
-            }
-        }
-
-        return addressData;
-    }
-
-    public ModelService getModelService() {
-        return modelService;
-    }
-
-    public void setModelService(ModelService modelService) {
-        this.modelService = modelService;
-    }
-
-    public CommonI18NService getCommonI18NService() {
-        return commonI18NService;
-    }
-
-    public void setCommonI18NService(CommonI18NService commonI18NService) {
-        this.commonI18NService = commonI18NService;
-    }
-}
diff --git a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
index e4745d308..4f179709e 100644
--- a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
+++ b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
@@ -45,7 +45,6 @@ public void populate(final CartModel source, final CartData target) throws Conve
             target.setAdyenSocialSecurityNumber(paymentInfo.getAdyenSocialSecurityNumber());
             target.setAdyenFirstName(paymentInfo.getAdyenFirstName());
             target.setAdyenLastName(paymentInfo.getAdyenLastName());
-            target.setAdyenPaymentToken(paymentInfo.getAdyenPaypalEcsToken());
             target.setAdyenCardHolder(paymentInfo.getAdyenCardHolder());
             target.setAdyenCardBrand(paymentInfo.getCardBrand());
             target.setAdyenCardType(paymentInfo.getCardType());
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
index 5ed014989..3a7388089 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
@@ -35,7 +35,6 @@
 import com.adyen.model.checkout.PaymentsDetailsRequest;
 import com.adyen.model.checkout.PaymentsRequest;
 import com.adyen.model.checkout.PaymentsResponse;
-import com.adyen.model.checkout.StoredPaymentMethod;
 import com.adyen.model.checkoututility.OriginKeysRequest;
 import com.adyen.model.checkoututility.OriginKeysResponse;
 import com.adyen.model.modification.CancelOrRefundRequest;
diff --git a/adyenv6core/testsrc/com/adyen/v6/facade/AdyenCheckoutFacadeTest.java b/adyenv6core/testsrc/com/adyen/v6/facade/AdyenCheckoutFacadeTest.java
deleted file mode 100644
index b948e07cc..000000000
--- a/adyenv6core/testsrc/com/adyen/v6/facade/AdyenCheckoutFacadeTest.java
+++ /dev/null
@@ -1,780 +0,0 @@
-package com.adyen.v6.facade;
-
-import com.adyen.model.checkout.InputDetail;
-import com.adyen.model.checkout.Item;
-import com.adyen.model.checkout.PaymentMethod;
-import com.adyen.model.checkout.PaymentMethodsResponse;
-import com.adyen.model.checkout.PaymentsResponse;
-import com.adyen.model.nexo.DocumentQualifierType;
-import com.adyen.model.nexo.ErrorConditionType;
-import com.adyen.model.nexo.OutputContent;
-import com.adyen.model.nexo.OutputText;
-import com.adyen.model.nexo.PaymentReceipt;
-import com.adyen.model.nexo.PaymentResponse;
-import com.adyen.model.nexo.RepeatedMessageResponse;
-import com.adyen.model.nexo.RepeatedResponseMessageBody;
-import com.adyen.model.nexo.Response;
-import com.adyen.model.nexo.ResultType;
-import com.adyen.model.nexo.SaleToPOIResponse;
-import com.adyen.model.nexo.TransactionStatusResponse;
-import com.adyen.model.terminal.TerminalAPIResponse;
-import com.adyen.service.exception.ApiException;
-import com.adyen.v6.constants.Adyenv6coreConstants;
-import com.adyen.v6.converters.PosPaymentResponseConverter;
-import com.adyen.v6.enums.RecurringContractMode;
-import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
-import com.adyen.v6.facades.AdyenCheckoutFacade;
-import com.adyen.v6.facades.DefaultAdyenCheckoutFacade;
-import com.adyen.v6.factory.AdyenPaymentServiceFactory;
-import com.adyen.v6.repository.OrderRepository;
-import com.adyen.v6.service.AdyenBusinessProcessService;
-import com.adyen.v6.service.AdyenOrderService;
-import com.adyen.v6.service.AdyenPaymentService;
-import com.adyen.v6.service.AdyenTransactionService;
-import de.hybris.bootstrap.annotations.UnitTest;
-import de.hybris.platform.commercefacades.order.CheckoutFacade;
-import de.hybris.platform.commercefacades.order.data.CartData;
-import de.hybris.platform.commercefacades.order.data.OrderData;
-import de.hybris.platform.commercefacades.product.data.PriceData;
-import de.hybris.platform.commercefacades.user.converters.populator.AddressPopulator;
-import de.hybris.platform.commercefacades.user.data.AddressData;
-import de.hybris.platform.commercefacades.user.data.CountryData;
-import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
-import de.hybris.platform.core.enums.OrderStatus;
-import de.hybris.platform.core.model.c2l.CountryModel;
-import de.hybris.platform.core.model.order.CartEntryModel;
-import de.hybris.platform.core.model.order.CartModel;
-import de.hybris.platform.core.model.order.OrderModel;
-import de.hybris.platform.core.model.order.delivery.DeliveryModeModel;
-import de.hybris.platform.core.model.user.AddressModel;
-import de.hybris.platform.core.model.user.CustomerModel;
-import de.hybris.platform.core.model.user.UserModel;
-import de.hybris.platform.order.CalculationService;
-import de.hybris.platform.order.CartFactory;
-import de.hybris.platform.order.CartService;
-import de.hybris.platform.order.InvalidCartException;
-import de.hybris.platform.payment.model.PaymentTransactionModel;
-import de.hybris.platform.servicelayer.dto.converter.Converter;
-import de.hybris.platform.servicelayer.i18n.CommonI18NService;
-import de.hybris.platform.servicelayer.model.ModelService;
-import de.hybris.platform.servicelayer.session.SessionService;
-import de.hybris.platform.store.BaseStoreModel;
-import de.hybris.platform.store.services.BaseStoreService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.ui.Model;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.security.SignatureException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.CHALLENGE_RESULT;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.FINGERPRINT_RESULT;
-import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_EPS;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ISSUER_LISTS;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_SELECTED_PAYMENT_METHOD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_PAYMENT_DATA;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_PENDING_ORDER_CODE;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_PARES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@UnitTest
-@RunWith(MockitoJUnitRunner.class)
-public class AdyenCheckoutFacadeTest {
-
-    private static final String DELIVERY_MODE = "deliveryMode";
-    private static final String EXCEPTION = "exception";
-    private static final String MD = "md";
-    private static final String MERCHANT_REFERENCE = "merchantReference";
-    private static final String PA_RES = "paRes";
-    private static final String PAYMENT_DATA = "paymentData";
-    private static final String PAYMENT_METHOD = "paymentMethod";
-    private static final String PENDING_ORDER_CODE = "pendingOrder";
-    private static final String RESULT = "result";
-    private static final String SERVICE_ID = "serviceId";
-    private static final String URL = "url";
-
-    @InjectMocks
-    DefaultAdyenCheckoutFacade adyenCheckoutFacade = new DefaultAdyenCheckoutFacade();
-
-    @Mock
-    AdyenPaymentServiceFactory adyenPaymentServiceFactory;
-    @Mock
-    AdyenPaymentService adyenPaymentService;
-    @Mock
-    BaseStoreService baseStoreService;
-    @Mock
-    CheckoutCustomerStrategy checkoutCustomerStrategy;
-    @Mock
-    PosPaymentResponseConverter posPaymentResponseConverter;
-    @Mock
-    CartService cartService;
-    @Mock
-    AdyenTransactionService adyenTransactionService;
-    @Mock
-    CheckoutFacade checkoutFacade;
-    @Mock
-    OrderRepository orderRepository;
-    @Mock
-    AdyenOrderService adyenOrderService;
-    @Mock
-    CommonI18NService commonI18NService;
-    @Mock
-    ModelService modelService;
-    @Mock
-    SessionService sessionService;
-    @Mock
-    Converter<CountryModel, CountryData> countryConverter;
-    @Mock
-    Converter<OrderModel, OrderData> orderConverter;
-    @Mock
-    CartFactory cartFactory;
-    @Mock
-    CalculationService calculationService;
-    @Mock
-    AddressPopulator addressPopulator;
-    @Mock
-    AdyenBusinessProcessService adyenBusinessProcessService;
-
-    @Mock
-    HttpServletRequest request;
-    @Mock
-    CartData cartData;
-    @Mock
-    CartModel cartModel;
-    @Mock
-    PaymentsResponse paymentsResponse;
-    @Mock
-    OrderData orderData;
-    @Mock
-    OrderModel orderModel;
-    @Mock
-    BaseStoreModel baseStore;
-    @Mock
-    PriceData priceData;
-    @Mock
-    AddressData addressData;
-    @Mock
-    AddressModel addressModel;
-    @Mock
-    CountryData countryData;
-    @Mock
-    DeliveryModeModel deliveryModeModel;
-    @Mock
-    UserModel userModel;
-    @Mock
-    BaseStoreModel storeModel;
-
-    @Mock
-    TerminalAPIResponse terminalApiResponse;
-    @Mock
-    SaleToPOIResponse saleToPoiResponse;
-    //Payment Response
-    @Mock
-    PaymentResponse paymentResponse;
-    @Mock
-    Response response;
-    //Status response
-    @Mock
-    Response statusResponse;
-    @Mock
-    TransactionStatusResponse transactionStatusResponse;
-    @Mock
-    RepeatedMessageResponse repeatedMessageResponse;
-    @Mock
-    RepeatedResponseMessageBody repeatedResponseMessageBody;
-    //Receipts
-    @Mock
-    PaymentReceipt receipt;
-    @Mock
-    OutputContent outputContent;
-    @Mock
-    OutputText textWithNameValue;
-    @Mock
-    OutputText textJustName;
-    @Mock
-    OutputText textJustValue;
-
-    @Before
-    public void setUp() {
-        when(checkoutCustomerStrategy.isAnonymousCheckout()).thenReturn(true);
-        when(checkoutCustomerStrategy.getCurrentUserForCheckout()).thenReturn(new CustomerModel());
-        when(request.getAttribute("originalServiceId")).thenReturn(SERVICE_ID);
-        when(baseStoreService.getCurrentBaseStore()).thenReturn(baseStore);
-        when(adyenPaymentServiceFactory.createFromBaseStore(any())).thenReturn(adyenPaymentService);
-    }
-
-    @Test
-    public void testInitializeEpsCheckoutData() throws Exception {
-        when(checkoutFacade.getCheckoutCart()).thenReturn(cartData);
-        when(baseStore.getAdyenPosEnabled()).thenReturn(false);
-        when(cartData.getTotalPrice()).thenReturn(priceData);
-        when(priceData.getValue()).thenReturn(BigDecimal.TEN);
-        when(priceData.getCurrencyIso()).thenReturn("EUR");
-        when(cartData.getDeliveryAddress()).thenReturn(addressData);
-        when(addressData.getCountry()).thenReturn(countryData);
-        when(countryData.getIsocode()).thenReturn("NL");
-        when(commonI18NService.getCurrentLanguage()).thenReturn(null);
-        when(adyenPaymentService.getPaymentMethodsResponse(any(), any(), any(), any(), any())).thenReturn(createEpsPaymentMethodsResponse());
-        when(baseStore.getAdyenRecurringContractMode()).thenReturn(RecurringContractMode.NONE);
-        when(cartService.getSessionCart()).thenReturn(new CartModel());
-        when(cartData.getAdyenPaymentMethod()).thenReturn(PAYMENT_METHOD_EPS);
-
-        Model model = new ExtendedModelMap();
-        adyenCheckoutFacade.initializeCheckoutData(model);
-
-        verify(modelService).save(any());
-        assertTrue(model.containsAttribute(MODEL_SELECTED_PAYMENT_METHOD));
-        assertEquals(PAYMENT_METHOD_EPS, model.asMap().get(MODEL_SELECTED_PAYMENT_METHOD));
-        assertTrue(model.containsAttribute(MODEL_ISSUER_LISTS));
-        assertTrue(((Map<String, String>) model.asMap().get(MODEL_ISSUER_LISTS)).containsKey(PAYMENT_METHOD_EPS));
-    }
-
-    private PaymentMethodsResponse createEpsPaymentMethodsResponse() {
-        PaymentMethod paymentMethod = new PaymentMethod();
-        paymentMethod.setType(PAYMENT_METHOD_EPS);
-        InputDetail detail = new InputDetail();
-        detail.setKey("issuer");
-        detail.setType("select");
-        Item item = new Item();
-        item.setId(UUID.randomUUID().toString());
-        item.setName("FakeIssuer");
-        detail.addItemsItem(item);
-        paymentMethod.addDetailsItem(detail);
-
-        PaymentMethodsResponse response = new PaymentMethodsResponse();
-        response.setPaymentMethods(Collections.singletonList(paymentMethod));
-
-        return response;
-    }
-
-    @Test
-    public void testInitiatePosPaymentSuccess() throws Exception {
-        when(adyenPaymentService.sendSyncPosPaymentRequest(eq(cartData), any(), eq(SERVICE_ID))).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getPaymentResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getPaymentResponse()).thenReturn(paymentResponse);
-        when(paymentResponse.getResponse()).thenReturn(response);
-        when(response.getResult()).thenReturn(ResultType.SUCCESS);
-
-        setSuccessfulPaymentStubs();
-
-        OrderData orderDataResult = adyenCheckoutFacade.initiatePosPayment(request, cartData);
-        assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).sendSyncPosPaymentRequest(eq(cartData), any(), eq(SERVICE_ID));
-        verify(posPaymentResponseConverter).convert(saleToPoiResponse);
-        verify(adyenTransactionService).authorizeOrderModel(any(), any(), any());
-        verify(checkoutFacade).placeOrder();
-    }
-
-    @Test
-    public void testInitiatePosPaymentFailure() throws Exception {
-        when(adyenPaymentService.sendSyncPosPaymentRequest(eq(cartData), any(), eq(SERVICE_ID))).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getPaymentResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getPaymentResponse()).thenReturn(paymentResponse);
-        when(paymentResponse.getResponse()).thenReturn(response);
-        when(response.getResult()).thenReturn(ResultType.FAILURE);
-
-        try {
-            adyenCheckoutFacade.initiatePosPayment(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(terminalApiResponse, e.getTerminalApiResponse());
-        }
-    }
-
-    @Test
-    public void testInitiatePosPaymentBadRequest() throws Exception {
-        when(adyenPaymentService.sendSyncPosPaymentRequest(eq(cartData), any(), eq(SERVICE_ID))).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getPaymentResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(null);
-
-        try {
-            adyenCheckoutFacade.initiatePosPayment(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(terminalApiResponse, e.getTerminalApiResponse());
-        }
-    }
-
-    @Test
-    public void testCheckPosPaymentStatusSuccessAndPaymentSuccess() throws Exception {
-        when(adyenPaymentService.sendSyncPosStatusRequest(cartData, SERVICE_ID)).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getStatusResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getTransactionStatusResponse()).thenReturn(transactionStatusResponse);
-        when(transactionStatusResponse.getResponse()).thenReturn(statusResponse);
-        when(statusResponse.getResult()).thenReturn(ResultType.SUCCESS);
-        //TerminalAPIUtil.getPaymentResult
-        when(saleToPoiResponse.getPaymentResponse()).thenReturn(null);
-        when(transactionStatusResponse.getRepeatedMessageResponse()).thenReturn(repeatedMessageResponse);
-        when(repeatedMessageResponse.getRepeatedResponseMessageBody()).thenReturn(repeatedResponseMessageBody);
-        when(repeatedResponseMessageBody.getPaymentResponse()).thenReturn(paymentResponse);
-        when(paymentResponse.getResponse()).thenReturn(response);
-        when(response.getResult()).thenReturn(ResultType.SUCCESS);
-
-        setSuccessfulPaymentStubs();
-
-        OrderData orderDataResult = adyenCheckoutFacade.checkPosPaymentStatus(request, cartData);
-        assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).sendSyncPosStatusRequest(cartData, SERVICE_ID);
-        verify(posPaymentResponseConverter).convert(saleToPoiResponse);
-        verify(adyenTransactionService).authorizeOrderModel(any(), any(), any());
-        verify(checkoutFacade).placeOrder();
-    }
-
-    @Test
-    public void testCheckPosPaymentStatusSuccessButPaymentFailure() throws Exception {
-        when(adyenPaymentService.sendSyncPosStatusRequest(cartData, SERVICE_ID)).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getStatusResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getTransactionStatusResponse()).thenReturn(transactionStatusResponse);
-        when(transactionStatusResponse.getResponse()).thenReturn(statusResponse);
-        when(statusResponse.getResult()).thenReturn(ResultType.SUCCESS);
-        //TerminalAPIUtil.getPaymentResult
-        when(saleToPoiResponse.getPaymentResponse()).thenReturn(null);
-        when(transactionStatusResponse.getRepeatedMessageResponse()).thenReturn(repeatedMessageResponse);
-        when(repeatedMessageResponse.getRepeatedResponseMessageBody()).thenReturn(repeatedResponseMessageBody);
-        when(repeatedResponseMessageBody.getPaymentResponse()).thenReturn(paymentResponse);
-        when(paymentResponse.getResponse()).thenReturn(response);
-        when(response.getResult()).thenReturn(ResultType.FAILURE);
-
-        try {
-            adyenCheckoutFacade.checkPosPaymentStatus(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(terminalApiResponse, e.getTerminalApiResponse());
-        }
-    }
-
-    @Test
-    public void testCheckPosPaymentStatusTimeout() throws Exception {
-        when(adyenPaymentService.sendSyncPosStatusRequest(cartData, SERVICE_ID)).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getStatusResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getTransactionStatusResponse()).thenReturn(transactionStatusResponse);
-        when(transactionStatusResponse.getResponse()).thenReturn(statusResponse);
-        when(statusResponse.getResult()).thenReturn(ResultType.FAILURE);
-        //TerminalAPIUtil.getErrorConditionForStatus
-        when(statusResponse.getErrorCondition()).thenReturn(ErrorConditionType.IN_PROGRESS);
-        //isPosTimedOut (will timeout after 10 seconds)
-        long processStartTime = System.currentTimeMillis();
-        when(request.getAttribute("paymentStartTime")).thenReturn(processStartTime);
-        when(request.getAttribute("totalTimeout")).thenReturn(10);
-
-        AdyenCheckoutFacade adyenCheckoutFacadeSpy = spy(adyenCheckoutFacade);
-        try {
-            adyenCheckoutFacadeSpy.checkPosPaymentStatus(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(terminalApiResponse, e.getTerminalApiResponse());
-            verify(adyenCheckoutFacadeSpy, atLeast(2)).checkPosPaymentStatus(request, cartData);
-        }
-    }
-
-    @Test
-    public void testCheckPosPaymentStatusError() throws Exception {
-        when(adyenPaymentService.sendSyncPosStatusRequest(cartData, SERVICE_ID)).thenReturn(terminalApiResponse);
-        when(posPaymentResponseConverter.convert(saleToPoiResponse)).thenReturn(paymentsResponse);
-        //TerminalAPIUtil.getStatusResult
-        when(terminalApiResponse.getSaleToPOIResponse()).thenReturn(saleToPoiResponse);
-        when(saleToPoiResponse.getTransactionStatusResponse()).thenReturn(transactionStatusResponse);
-        when(transactionStatusResponse.getResponse()).thenReturn(statusResponse);
-        when(statusResponse.getResult()).thenReturn(ResultType.FAILURE);
-        //TerminalAPIUtil.getErrorConditionForStatus
-        when(statusResponse.getErrorCondition()).thenReturn(ErrorConditionType.CANCEL);
-
-        try {
-            adyenCheckoutFacade.checkPosPaymentStatus(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(terminalApiResponse, e.getTerminalApiResponse());
-        }
-    }
-
-
-    private void setSuccessfulPaymentStubs() throws InvalidCartException {
-        //Receipt
-        when(paymentResponse.getPaymentReceipt()).thenReturn(Collections.singletonList(receipt));
-        when(receipt.getDocumentQualifier()).thenReturn(DocumentQualifierType.CUSTOMER_RECEIPT);
-        when(receipt.getOutputContent()).thenReturn(outputContent);
-        when(outputContent.getOutputText()).thenReturn(Arrays.asList(textWithNameValue, textJustName, textJustValue));
-        when(textWithNameValue.getText()).thenReturn("name=some_name&value=some_value");
-        when(textJustName.getText()).thenReturn("name=some_name");
-        when(textJustValue.getText()).thenReturn("value=some_value");
-        //createAuthorizedOrder
-        when(cartService.getSessionCart()).thenReturn(new CartModel());
-        when(adyenTransactionService.authorizeOrderModel(any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        //createOrderFromPaymentsResponse
-        when(checkoutFacade.placeOrder()).thenReturn(orderData);
-        when(orderRepository.getOrderModel(any())).thenReturn(new OrderModel());
-        //updateOrder
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-    }
-
-    @Test
-    public void testAuthorisePaymentRedirect() throws Exception {
-        doNothing().when(sessionService).removeAttribute(any());
-        when(cartData.getAdyenPaymentMethod()).thenReturn(PAYMENT_METHOD);
-        when(commonI18NService.getCurrentLanguage()).thenReturn(null);
-        when(request.getRequestURL()).thenReturn(new StringBuffer(URL));
-        when(request.getRequestURI()).thenReturn(URL);
-        when(adyenPaymentService.authorisePayment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER);
-        when(checkoutFacade.placeOrder()).thenReturn(orderData);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(modelService).save(any());
-        when(cartService.getSessionCart()).thenReturn(cartModel);
-
-        try {
-            adyenCheckoutFacade.authorisePayment(request, cartData);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorisePayment(eq(cartData), any(), any());
-            verify(cartModel).setStatus(OrderStatus.PAYMENT_PENDING);
-            verify(checkoutFacade).placeOrder();
-            assertNotNull(e.getPaymentsResponse());
-            assertEquals(PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER, e.getPaymentsResponse().getResultCode());
-        }
-    }
-
-    @Test
-    public void testHandle3DResponseAuthorised() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.AUTHORISED);
-        doNothing().when(modelService).save(any());
-        when(orderConverter.convert(any())).thenReturn(orderData);
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-
-        OrderData orderDataResult = adyenCheckoutFacade.handle3DResponse(request);
-        assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
-        verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
-        verify(orderConverter).convert(orderModel);
-    }
-
-    @Test
-    public void testHandle3DResponseError() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.REFUSED);
-        doNothing().when(modelService).save(any());
-        when(cartFactory.createCart()).thenReturn(cartModel);
-        doNothing().when(cartService).setSessionCart(any());
-        doNothing().when(cartService).changeCurrentCartUser(any());
-        when(orderModel.getEntries()).thenReturn(Collections.emptyList());
-        when(orderModel.getDeliveryAddress()).thenReturn(addressModel);
-        when(addressModel.getOriginal()).thenReturn(addressModel);
-        when(orderModel.getDeliveryMode()).thenReturn(deliveryModeModel);
-        when(deliveryModeModel.getCode()).thenReturn(DELIVERY_MODE);
-        doNothing().when(addressPopulator).populate(any(), any());
-        when(checkoutFacade.setDeliveryAddress(any())).thenReturn(true);
-        when(checkoutFacade.setDeliveryMode(any())).thenReturn(true);
-        doNothing().when(calculationService).calculate(any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-        when(orderModel.getUser()).thenReturn(userModel);
-        when(cartModel.getUser()).thenReturn(userModel);
-        when(orderModel.getStore()).thenReturn(storeModel);
-        when(cartModel.getStore()).thenReturn(storeModel);
-
-        try {
-            adyenCheckoutFacade.handle3DResponse(request);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
-            verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
-            verify(cartFactory).createCart();
-            verify(cartService).setSessionCart(cartModel);
-            verify(calculationService).calculate(cartModel);
-        }
-    }
-
-    @Test
-    public void testHandle3DResponseThrowsApiException() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(sessionService.getAttribute(SESSION_PENDING_ORDER_CODE)).thenReturn(PENDING_ORDER_CODE);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenThrow(new ApiException(EXCEPTION, 999));
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        doNothing().when(modelService).save(any());
-        when(cartFactory.createCart()).thenReturn(cartModel);
-        doNothing().when(cartService).setSessionCart(any());
-        doNothing().when(cartService).changeCurrentCartUser(any());
-        when(orderModel.getEntries()).thenReturn(Collections.emptyList());
-        when(orderModel.getDeliveryAddress()).thenReturn(addressModel);
-        when(addressModel.getOriginal()).thenReturn(addressModel);
-        when(orderModel.getDeliveryMode()).thenReturn(deliveryModeModel);
-        when(deliveryModeModel.getCode()).thenReturn(DELIVERY_MODE);
-        doNothing().when(addressPopulator).populate(any(), any());
-        when(checkoutFacade.setDeliveryAddress(any())).thenReturn(true);
-        when(checkoutFacade.setDeliveryMode(any())).thenReturn(true);
-        doNothing().when(calculationService).calculate(any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-        when(orderModel.getUser()).thenReturn(userModel);
-        when(cartModel.getUser()).thenReturn(userModel);
-        when(orderModel.getStore()).thenReturn(storeModel);
-        when(cartModel.getStore()).thenReturn(storeModel);
-
-        try {
-            adyenCheckoutFacade.handle3DResponse(request);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(e.getMessage(), EXCEPTION);
-            verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
-            verify(orderRepository, times(2)).getOrderModel(PENDING_ORDER_CODE);
-            verify(cartFactory).createCart();
-            verify(cartService).setSessionCart(cartModel);
-            verify(calculationService).calculate(cartModel);
-        }
-    }
-
-    @Test
-    public void testHandle3DResponseWrongSignature() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn("different_" + MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-
-        try {
-            adyenCheckoutFacade.handle3DResponse(request);
-            fail("Expected SignatureException");
-        } catch (SignatureException e) {
-            assertEquals("MD does not match!", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testHandle3DS2ResponseAuthorised() throws Exception {
-        when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
-        when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.AUTHORISED);
-        doNothing().when(modelService).save(any());
-        when(orderConverter.convert(any())).thenReturn(orderData);
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-
-        OrderData orderDataResult = adyenCheckoutFacade.handle3DS2Response(request);
-        assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
-        verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
-        verify(orderConverter).convert(orderModel);
-    }
-
-    @Test
-    public void testHandle3DS2ResponseChallengeShopper() throws Exception {
-        when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(RESULT);
-        when(request.getParameter(CHALLENGE_RESULT)).thenReturn(null);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER);
-
-        try {
-            adyenCheckoutFacade.handle3DS2Response(request);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "fingerprint");
-            assertNotNull(e.getPaymentsResponse());
-            assertEquals(PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER, e.getPaymentsResponse().getResultCode());
-        }
-    }
-
-    @Test
-    public void testHandle3DS2ResponseError() throws Exception {
-        when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
-        when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.REFUSED);
-        doNothing().when(modelService).save(any());
-        when(cartFactory.createCart()).thenReturn(cartModel);
-        doNothing().when(cartService).setSessionCart(any());
-        doNothing().when(cartService).changeCurrentCartUser(any());
-        when(orderModel.getEntries()).thenReturn(Collections.emptyList());
-        when(orderModel.getDeliveryAddress()).thenReturn(addressModel);
-        when(addressModel.getOriginal()).thenReturn(addressModel);
-        when(orderModel.getDeliveryMode()).thenReturn(deliveryModeModel);
-        when(deliveryModeModel.getCode()).thenReturn(DELIVERY_MODE);
-        doNothing().when(addressPopulator).populate(any(), any());
-        when(checkoutFacade.setDeliveryAddress(any())).thenReturn(true);
-        when(checkoutFacade.setDeliveryMode(any())).thenReturn(true);
-        doNothing().when(calculationService).calculate(any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-        when(orderModel.getUser()).thenReturn(userModel);
-        when(cartModel.getUser()).thenReturn(userModel);
-        when(orderModel.getStore()).thenReturn(storeModel);
-        when(cartModel.getStore()).thenReturn(storeModel);
-
-        try {
-            adyenCheckoutFacade.handle3DS2Response(request);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
-            verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
-            verify(cartFactory).createCart();
-            verify(cartService).setSessionCart(cartModel);
-            verify(calculationService).calculate(cartModel);
-        }
-    }
-
-    @Test
-    public void testHandle3DS2ResponseThrowsApiException() throws Exception {
-        when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
-        when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(sessionService.getAttribute(SESSION_PENDING_ORDER_CODE)).thenReturn(PENDING_ORDER_CODE);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenThrow(new ApiException(EXCEPTION, 999));
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        doNothing().when(modelService).save(any());
-        when(cartFactory.createCart()).thenReturn(cartModel);
-        doNothing().when(cartService).setSessionCart(any());
-        doNothing().when(cartService).changeCurrentCartUser(any());
-        when(orderModel.getEntries()).thenReturn(Collections.emptyList());
-        when(orderModel.getDeliveryAddress()).thenReturn(addressModel);
-        when(addressModel.getOriginal()).thenReturn(addressModel);
-        when(orderModel.getDeliveryMode()).thenReturn(deliveryModeModel);
-        when(deliveryModeModel.getCode()).thenReturn(DELIVERY_MODE);
-        doNothing().when(addressPopulator).populate(any(), any());
-        when(checkoutFacade.setDeliveryAddress(any())).thenReturn(true);
-        when(checkoutFacade.setDeliveryMode(any())).thenReturn(true);
-        doNothing().when(calculationService).calculate(any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-        when(orderModel.getUser()).thenReturn(userModel);
-        when(cartModel.getUser()).thenReturn(userModel);
-        when(orderModel.getStore()).thenReturn(storeModel);
-        when(cartModel.getStore()).thenReturn(storeModel);
-
-        try {
-            adyenCheckoutFacade.handle3DS2Response(request);
-            fail("Expected AdyenNonAuthorizedPaymentException");
-        } catch (AdyenNonAuthorizedPaymentException e) {
-            assertEquals(e.getMessage(), EXCEPTION);
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
-            verify(orderRepository, times(2)).getOrderModel(PENDING_ORDER_CODE);
-            verify(cartFactory).createCart();
-            verify(cartService).setSessionCart(cartModel);
-            verify(calculationService).calculate(cartModel);
-        }
-    }
-
-    @Test
-    public void testHandleRedirectPayloadAuthorised() throws Exception {
-        when(sessionService.getAttribute(Adyenv6coreConstants.PAYMENT_METHOD)).thenReturn(PAYMENT_METHOD);
-        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.AUTHORISED);
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-
-        HashMap<String, String> details = new HashMap<>();
-        PaymentsResponse paymentsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
-        assertEquals(paymentsResponseReturned, paymentsResponse);
-        assertEquals(PaymentsResponse.ResultCodeEnum.AUTHORISED, paymentsResponseReturned.getResultCode());
-        verify(adyenPaymentService).getPaymentDetailsFromPayload(details);
-        verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
-    }
-
-    @Test
-    public void testHandleRedirectPayloadNotAuthorised() throws Exception {
-        when(sessionService.getAttribute(Adyenv6coreConstants.PAYMENT_METHOD)).thenReturn(PAYMENT_METHOD);
-        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsResponse);
-        when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
-        when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
-        doNothing().when(sessionService).removeAttribute(any());
-        when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.REFUSED);
-        doNothing().when(modelService).save(any());
-        when(cartFactory.createCart()).thenReturn(cartModel);
-        doNothing().when(cartService).setSessionCart(any());
-        doNothing().when(cartService).changeCurrentCartUser(any());
-        when(orderModel.getEntries()).thenReturn(Collections.emptyList());
-        when(orderModel.getDeliveryAddress()).thenReturn(addressModel);
-        when(addressModel.getOriginal()).thenReturn(addressModel);
-        when(orderModel.getDeliveryMode()).thenReturn(deliveryModeModel);
-        when(deliveryModeModel.getCode()).thenReturn(DELIVERY_MODE);
-        doNothing().when(addressPopulator).populate(any(), any());
-        when(checkoutFacade.setDeliveryAddress(any())).thenReturn(true);
-        when(checkoutFacade.setDeliveryMode(any())).thenReturn(true);
-        doNothing().when(calculationService).calculate(any());
-        when(adyenTransactionService.createPaymentTransactionFromResultCode(any(), any(), any(), any())).thenReturn(new PaymentTransactionModel());
-        doNothing().when(adyenOrderService).updateOrderFromPaymentsResponse(any(), any());
-        doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
-        when(orderModel.getUser()).thenReturn(userModel);
-        when(cartModel.getUser()).thenReturn(userModel);
-        when(orderModel.getStore()).thenReturn(storeModel);
-        when(cartModel.getStore()).thenReturn(storeModel);
-
-        HashMap<String, String> details = new HashMap<>();
-        PaymentsResponse paymentsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
-        assertEquals(paymentsResponseReturned, paymentsResponse);
-        assertEquals(PaymentsResponse.ResultCodeEnum.REFUSED, paymentsResponseReturned.getResultCode());
-        verify(adyenPaymentService).getPaymentDetailsFromPayload(details);
-        verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
-        verify(cartFactory).createCart();
-        verify(cartService).setSessionCart(cartModel);
-        verify(calculationService).calculate(cartModel);
-    }
-}
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index 85f03046c..7e410af86 100644
--- a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
+++ b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6fulfilmentprocess
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index 5ba612de4..9441630b6 100644
--- a/adyenv6notification/resources/adyenv6notification.build.number
+++ b/adyenv6notification/resources/adyenv6notification.build.number
@@ -5,5 +5,5 @@ description=adyenv6notification
 name=adyenv6notification
 releasedate=20170803 1323
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index d35aede69..7507b3093 100644
--- a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6ordermanagement
 releasedate=20170509 1754
 vendor=adyen
-version=7.0.0
-version.api=7.0.0
+version=7.1.0
+version.api=7.1.0