killbill-aplcache

diff --git a/api/pom.xml b/api/pom.xml
index f691349..709b8d4 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -54,6 +54,10 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
 
     </dependencies>
     <build>

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
index 553d6a2..2d4b25f 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
@@ -16,23 +16,34 @@
 
 package com.ning.billing.payment.api;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.google.common.base.Objects;
 
 public class PaymentProviderAccount {
     private final String id;
     private final String accountNumber;
-    private final String accountName;
+    private final String firstName;
+    private final String lastName;
+    private final String email;
+    private final String currency;
     private final String phoneNumber;
     private final String defaultPaymentMethodId;
 
     public PaymentProviderAccount(String id,
                                   String accountNumber,
-                                  String accountName,
+                                  String firstName,
+                                  String lastName,
+                                  String email,
+                                  String currency,
                                   String phoneNumber,
                                   String defaultPaymentMethodId) {
         this.id = id;
         this.accountNumber = accountNumber;
-        this.accountName = accountName;
+        this.firstName = StringUtils.substring(firstName, 0, 100);
+        this.lastName  = StringUtils.substring(lastName, 0, 100);
+        this.email     = StringUtils.substring(lastName, 0, 80);
+        this.currency = currency;
         this.phoneNumber = phoneNumber;
         this.defaultPaymentMethodId = defaultPaymentMethodId;
     }
@@ -45,8 +56,20 @@ public class PaymentProviderAccount {
         return accountNumber;
     }
 
-    public String getAccountName() {
-        return accountName;
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public String getEmail() {
+        return email;
     }
 
     public String getPhoneNumber() {
@@ -60,7 +83,10 @@ public class PaymentProviderAccount {
     public static class Builder {
         private String id;
         private String accountNumber;
-        private String accountName;
+        private String firstName;
+        private String lastName;
+        private String email;
+        private String currency;
         private String phoneNumber;
         private String defaultPaymentMethodId;
 
@@ -74,8 +100,23 @@ public class PaymentProviderAccount {
             return this;
         }
 
-        public Builder setAccountName(String accountName) {
-            this.accountName = accountName;
+        public Builder setFirstName(String firstName) {
+            this.firstName = firstName;
+            return this;
+        }
+
+        public Builder setLastName(String lastName) {
+            this.lastName = lastName;
+            return this;
+        }
+
+        public Builder setEmail(String email) {
+            this.email = email;
+            return this;
+        }
+
+        public Builder setCurrency(String currency) {
+            this.currency = currency;
             return this;
         }
 
@@ -90,7 +131,7 @@ public class PaymentProviderAccount {
         }
 
         public PaymentProviderAccount build() {
-            return new PaymentProviderAccount(id, accountNumber, accountName, phoneNumber, defaultPaymentMethodId);
+            return new PaymentProviderAccount(id, accountNumber, firstName, lastName, email, currency, phoneNumber, defaultPaymentMethodId);
         }
 
     }
@@ -99,7 +140,8 @@ public class PaymentProviderAccount {
     public int hashCode() {
         return Objects.hashCode(id,
                                 accountNumber,
-                                accountName,
+                                firstName,
+                                lastName,
                                 phoneNumber,
                                 defaultPaymentMethodId);
     }