diff --git a/src/main/java/com/mangopay/entities/BinData.java b/src/main/java/com/mangopay/entities/BinData.java
index 38fd486f..809cbbdf 100644
--- a/src/main/java/com/mangopay/entities/BinData.java
+++ b/src/main/java/com/mangopay/entities/BinData.java
@@ -16,6 +16,18 @@ public class BinData {
     @SerializedName("Brand")
     private String brand;
 
+    /**
+     * Whether the card is held in a personal or commercial capacity.
+     */
+    @SerializedName("CommercialIndicator")
+    private String commercialIndicator;
+
+    /**
+     * The type of the card. Allowed / Returned / Default values: CREDIT, DEBIT, CHARGE CARD
+     */
+    @SerializedName("CardType")
+    private String cardType;
+
     public String getSubtype() {
         return subtype;
     }
@@ -31,4 +43,22 @@ public String getBrand() {
     public void setBrand(String brand) {
         this.brand = brand;
     }
+
+    public String getCommercialIndicator() {
+        return commercialIndicator;
+    }
+
+    public BinData setCommercialIndicator(String commercialIndicator) {
+        this.commercialIndicator = commercialIndicator;
+        return this;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public BinData setCardType(String cardType) {
+        this.cardType = cardType;
+        return this;
+    }
 }
diff --git a/src/main/java/com/mangopay/entities/PaymentMethodMetadata.java b/src/main/java/com/mangopay/entities/PaymentMethodMetadata.java
index 2494ef74..ea0ae293 100644
--- a/src/main/java/com/mangopay/entities/PaymentMethodMetadata.java
+++ b/src/main/java/com/mangopay/entities/PaymentMethodMetadata.java
@@ -33,12 +33,6 @@ public class PaymentMethodMetadata extends EntityBase {
     @SerializedName("TokenFormat")
     private String tokenFormat;
 
-    /**
-     * The type of the card. Allowed / Returned / Default values: CREDIT, DEBIT, CHARGE CARD
-     */
-    @SerializedName("CardType")
-    private String cardType;
-
     /**
      * The country where the card was issued. Format: ISO-3166 alpha-2 two-letter country code
      */
@@ -51,12 +45,6 @@ public class PaymentMethodMetadata extends EntityBase {
     @SerializedName("IssuingBank")
     private String issuingBank;
 
-    /**
-     * Whether the card is held in a personal or commercial capacity.
-     */
-    @SerializedName("CommercialIndicator")
-    private String commercialIndicator;
-
     /**
      * Additional data about the card based on the BIN. In the case of co-branded card products, two objects are returned.
      */
@@ -95,14 +83,6 @@ public void setTokenFormat(String tokenFormat) {
         this.tokenFormat = tokenFormat;
     }
 
-    public String getCardType() {
-        return cardType;
-    }
-
-    public void setCardType(String cardType) {
-        this.cardType = cardType;
-    }
-
     public String getIssuerCountryCode() {
         return issuerCountryCode;
     }
@@ -119,14 +99,6 @@ public void setIssuingBank(String issuingBank) {
         this.issuingBank = issuingBank;
     }
 
-    public String getCommercialIndicator() {
-        return commercialIndicator;
-    }
-
-    public void setCommercialIndicator(String commercialIndicator) {
-        this.commercialIndicator = commercialIndicator;
-    }
-
     public List<BinData> getBinData() {
         return binData;
     }
diff --git a/src/test/java/com/mangopay/core/PayInApiImplTest.java b/src/test/java/com/mangopay/core/PayInApiImplTest.java
index 1b1ddabc..e518ce01 100644
--- a/src/test/java/com/mangopay/core/PayInApiImplTest.java
+++ b/src/test/java/com/mangopay/core/PayInApiImplTest.java
@@ -208,7 +208,7 @@ public void cardDirectGetPaymentMethodsMetadata() {
             assertNotNull(resultMetadata.getIssuerCountryCode());
             assertNotNull(resultMetadata.getIssuingBank());
             assertNotNull(resultMetadata.getBinData());
-            assertNotNull(resultMetadata.getCardType());
+            assertNotNull(resultMetadata.getBinData().get(0).getCardType());
 
         } catch (Exception ex) {
             fail(ex.getMessage());