killbill-aplcache

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
index 27efd2e..7475d32 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
@@ -129,7 +129,7 @@ public class DefaultAccount extends EntityBase implements Account {
     public DefaultAccount(final AccountModelDao accountModelDao) {
         this(accountModelDao.getId(), accountModelDao.getCreatedDate(), accountModelDao.getUpdatedDate(), accountModelDao.getExternalKey(),
              accountModelDao.getEmail(), accountModelDao.getName(), accountModelDao.getFirstNameLength(), accountModelDao.getCurrency(),
-             new DefaultBillCycleDay(accountModelDao.getBillingCycleDayLocal(), accountModelDao.getBillingCycleDayUTC()), accountModelDao.getPaymentMethodId(),
+             new DefaultBillCycleDay(accountModelDao.getBillingCycleDayLocal(), accountModelDao.getBillingCycleDayUtc()), accountModelDao.getPaymentMethodId(),
              accountModelDao.getTimeZone(), accountModelDao.getLocale(), accountModelDao.getAddress1(), accountModelDao.getAddress2(),
              accountModelDao.getCompanyName(), accountModelDao.getCity(), accountModelDao.getStateOrProvince(), accountModelDao.getCountry(),
              accountModelDao.getPostalCode(), accountModelDao.getPhone(), accountModelDao.getMigrated(), accountModelDao.getIsNotifiedForInvoices());

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
index d0bbbe3..823d502 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
@@ -18,6 +18,7 @@ package com.ning.billing.account.api;
 
 import java.util.UUID;
 
+import com.ning.billing.account.dao.AccountEmailModelDao;
 import com.ning.billing.util.entity.EntityBase;
 
 public class DefaultAccountEmail extends EntityBase implements AccountEmail {
@@ -31,10 +32,10 @@ public class DefaultAccountEmail extends EntityBase implements AccountEmail {
         this.email = email;
     }
 
-    public DefaultAccountEmail(final UUID id, final UUID accountId, final String email) {
-        super(id);
-        this.accountId = accountId;
-        this.email = email;
+    public DefaultAccountEmail(final AccountEmailModelDao accountEmail) {
+        super(accountEmail.getId(), accountEmail.getCreatedDate(), accountEmail.getUpdatedDate());
+        this.accountId = accountEmail.getAccountId();
+        this.email = accountEmail.getEmail();
     }
 
     @Override

diff --git a/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java b/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
index 2dc669b..24f2cbe 100644
--- a/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
+++ b/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
@@ -27,13 +27,19 @@ import com.ning.billing.account.api.AccountApiException;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.account.api.AccountEmail;
 import com.ning.billing.account.api.DefaultAccount;
+import com.ning.billing.account.api.DefaultAccountEmail;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.dao.AccountEmailDao;
+import com.ning.billing.account.dao.AccountEmailModelDao;
 import com.ning.billing.account.dao.AccountModelDao;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.svcapi.account.AccountInternalApi;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
+
 public class DefaultAccountInternalApi implements AccountInternalApi {
 
     private final AccountDao accountDao;
@@ -78,7 +84,13 @@ public class DefaultAccountInternalApi implements AccountInternalApi {
     @Override
     public List<AccountEmail> getEmails(final UUID accountId,
                                         final InternalTenantContext context) {
-        return accountEmailDao.getByAccountId(accountId, context);
+        return ImmutableList.<AccountEmail>copyOf(Collections2.transform(accountEmailDao.getByAccountId(accountId, context),
+                                                                         new Function<AccountEmailModelDao, AccountEmail>() {
+                                                                             @Override
+                                                                             public AccountEmail apply(final AccountEmailModelDao input) {
+                                                                                 return new DefaultAccountEmail(input);
+                                                                             }
+                                                                         }));
     }
 
     @Override

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
index f7d67f0..758b562 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
@@ -157,7 +157,7 @@ public class DefaultAccountChangeEvent extends DefaultBusInternalEvent implement
 
         addIfValueChanged(tmpChangedFields,
                           "billCycleDayUTC",
-                          String.valueOf(oldData.getBillingCycleDayUTC()), String.valueOf(newData.getBillingCycleDayUTC()));
+                          String.valueOf(oldData.getBillingCycleDayUtc()), String.valueOf(newData.getBillingCycleDayUtc()));
 
         addIfValueChanged(tmpChangedFields, "paymentMethodId",
                           (oldData.getPaymentMethodId() != null) ? oldData.getPaymentMethodId().toString() : null,

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
index a43baaa..6fddef1 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
@@ -135,7 +135,7 @@ public class DefaultAccountCreationEvent extends DefaultBusInternalEvent impleme
                  d.getName(),
                  d.getFirstNameLength(),
                  d.getEmail(),
-                 new DefaultBillCycleDay(d.getBillingCycleDayLocal(), d.getBillingCycleDayUTC()),
+                 new DefaultBillCycleDay(d.getBillingCycleDayLocal(), d.getBillingCycleDayUtc()),
                  d.getCurrency() != null ? d.getCurrency().name() : null,
                  d.getPaymentMethodId(),
                  d.getTimeZone() != null ? d.getTimeZone().getID() : null,

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
index 3e00949..05ddb29 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
@@ -34,6 +34,7 @@ import com.ning.billing.account.api.DefaultAccountEmail;
 import com.ning.billing.account.api.MigrationAccountData;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.dao.AccountEmailDao;
+import com.ning.billing.account.dao.AccountEmailModelDao;
 import com.ning.billing.account.dao.AccountModelDao;
 import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.callcontext.CallContextFactory;
@@ -164,16 +165,22 @@ public class DefaultAccountUserApi implements AccountUserApi {
 
     @Override
     public List<AccountEmail> getEmails(final UUID accountId, final TenantContext context) {
-        return accountEmailDao.getByAccountId(accountId, internalCallContextFactory.createInternalTenantContext(context));
+        return ImmutableList.<AccountEmail>copyOf(Collections2.transform(accountEmailDao.getByAccountId(accountId, internalCallContextFactory.createInternalTenantContext(context)),
+                                                                         new Function<AccountEmailModelDao, AccountEmail>() {
+                                                                             @Override
+                                                                             public AccountEmail apply(final AccountEmailModelDao input) {
+                                                                                 return new DefaultAccountEmail(input);
+                                                                             }
+                                                                         }));
     }
 
     @Override
     public void addEmail(final UUID accountId, final AccountEmail email, final CallContext context) throws AccountApiException {
-        accountEmailDao.create(email, internalCallContextFactory.createInternalCallContext(accountId, context));
+        accountEmailDao.create(new AccountEmailModelDao(email), internalCallContextFactory.createInternalCallContext(accountId, context));
     }
 
     @Override
     public void removeEmail(final UUID accountId, final AccountEmail email, final CallContext context) {
-        accountEmailDao.delete(email, internalCallContextFactory.createInternalCallContext(accountId, context));
+        accountEmailDao.delete(new AccountEmailModelDao(email), internalCallContextFactory.createInternalCallContext(accountId, context));
     }
 }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailDao.java
index c7abebd..5feb039 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailDao.java
@@ -20,14 +20,13 @@ import java.util.List;
 import java.util.UUID;
 
 import com.ning.billing.account.api.AccountApiException;
-import com.ning.billing.account.api.AccountEmail;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.entity.dao.EntityDao;
 
-public interface AccountEmailDao extends EntityDao<AccountEmail, AccountApiException> {
+public interface AccountEmailDao extends EntityDao<AccountEmailModelDao, AccountApiException> {
 
-    public void delete(AccountEmail email, InternalCallContext context);
+    public void delete(AccountEmailModelDao email, InternalCallContext context);
 
-    public List<AccountEmail> getByAccountId(UUID accountId, InternalTenantContext context);
+    public List<AccountEmailModelDao> getByAccountId(UUID accountId, InternalTenantContext context);
 }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailModelDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailModelDao.java
new file mode 100644
index 0000000..76792e0
--- /dev/null
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailModelDao.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.dao;
+
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.account.api.AccountEmail;
+import com.ning.billing.util.entity.EntityBase;
+
+public class AccountEmailModelDao extends EntityBase {
+
+    private UUID accountId;
+    private String email;
+
+    public AccountEmailModelDao() { /* For the DAO mapper */ }
+
+    public AccountEmailModelDao(final UUID id, final DateTime createdDate, final DateTime updatedDate, final UUID accountId, final String email) {
+        super(id, createdDate, updatedDate);
+        this.accountId = accountId;
+        this.email = email;
+    }
+
+    public AccountEmailModelDao(final AccountEmail email) {
+        this(email.getId(), email.getCreatedDate(), email.getUpdatedDate(), email.getAccountId(), email.getEmail());
+    }
+
+    public UUID getAccountId() {
+        return accountId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("AccountEmailModelDao");
+        sb.append("{accountId=").append(accountId);
+        sb.append(", email='").append(email).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        final AccountEmailModelDao that = (AccountEmailModelDao) o;
+
+        if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        if (email != null ? !email.equals(that.email) : that.email != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+        result = 31 * result + (email != null ? email.hashCode() : 0);
+        return result;
+    }
+}

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
index ee830d4..b4180df 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailSqlDao.java
@@ -23,9 +23,7 @@ import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.BindBean;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.SqlUpdate;
-import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
 
-import com.ning.billing.account.api.AccountEmail;
 import com.ning.billing.util.audit.ChangeType;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
@@ -34,15 +32,14 @@ import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoStringTemplate;
 
 @EntitySqlDaoStringTemplate
-@RegisterMapper(AccountEmailMapper.class)
-public interface AccountEmailSqlDao extends EntitySqlDao<AccountEmail> {
+public interface AccountEmailSqlDao extends EntitySqlDao<AccountEmailModelDao> {
 
     @SqlUpdate
     @Audited(ChangeType.DELETE)
-    public void delete(@BindBean final AccountEmail accountEmail,
+    public void delete(@BindBean final AccountEmailModelDao accountEmail,
                        @BindBean final InternalCallContext context);
 
     @SqlQuery
-    public List<AccountEmail> getEmailByAccountId(@Bind("accountId") final UUID accountId,
-                                                  @BindBean final InternalTenantContext context);
+    public List<AccountEmailModelDao> getEmailByAccountId(@Bind("accountId") final UUID accountId,
+                                                          @BindBean final InternalTenantContext context);
 }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountModelDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountModelDao.java
index 5a06b52..e0e4a05 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountModelDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountModelDao.java
@@ -29,30 +29,32 @@ import com.ning.billing.util.entity.EntityBase;
 
 public class AccountModelDao extends EntityBase {
 
-    private final String externalKey;
-    private final String email;
-    private final String name;
-    private final Integer firstNameLength;
-    private final Currency currency;
-    private final int billingCycleDayLocal;
-    private final int billingCycleDayUTC;
-    private final UUID paymentMethodId;
-    private final DateTimeZone timeZone;
-    private final String locale;
-    private final String address1;
-    private final String address2;
-    private final String companyName;
-    private final String city;
-    private final String stateOrProvince;
-    private final String country;
-    private final String postalCode;
-    private final String phone;
-    private final Boolean isMigrated;
-    private final Boolean isNotifiedForInvoices;
+    private String externalKey;
+    private String email;
+    private String name;
+    private Integer firstNameLength;
+    private Currency currency;
+    private int billingCycleDayLocal;
+    private int billingCycleDayUtc;
+    private UUID paymentMethodId;
+    private DateTimeZone timeZone;
+    private String locale;
+    private String address1;
+    private String address2;
+    private String companyName;
+    private String city;
+    private String stateOrProvince;
+    private String country;
+    private String postalCode;
+    private String phone;
+    private Boolean migrated;
+    private Boolean isNotifiedForInvoices;
+
+    public AccountModelDao() { /* For the DAO mapper */ }
 
     public AccountModelDao(final UUID id, final DateTime createdDate, final DateTime updatedDate, final String externalKey,
                            final String email, final String name, final Integer firstNameLength, final Currency currency,
-                           final int billingCycleDayLocal, final int billingCycleDayUTC, final UUID paymentMethodId, final DateTimeZone timeZone,
+                           final int billingCycleDayLocal, final int billingCycleDayUtc, final UUID paymentMethodId, final DateTimeZone timeZone,
                            final String locale, final String address1, final String address2, final String companyName,
                            final String city, final String stateOrProvince, final String country, final String postalCode,
                            final String phone, final Boolean migrated, final Boolean notifiedForInvoices) {
@@ -63,7 +65,7 @@ public class AccountModelDao extends EntityBase {
         this.firstNameLength = firstNameLength;
         this.currency = currency;
         this.billingCycleDayLocal = billingCycleDayLocal;
-        this.billingCycleDayUTC = billingCycleDayUTC;
+        this.billingCycleDayUtc = billingCycleDayUtc;
         this.paymentMethodId = paymentMethodId;
         this.timeZone = timeZone;
         this.locale = locale;
@@ -75,7 +77,7 @@ public class AccountModelDao extends EntityBase {
         this.country = country;
         this.postalCode = postalCode;
         this.phone = phone;
-        this.isMigrated = migrated;
+        this.migrated = migrated;
         this.isNotifiedForInvoices = notifiedForInvoices;
     }
 
@@ -119,8 +121,8 @@ public class AccountModelDao extends EntityBase {
         return billingCycleDayLocal;
     }
 
-    public int getBillingCycleDayUTC() {
-        return billingCycleDayUTC;
+    public int getBillingCycleDayUtc() {
+        return billingCycleDayUtc;
     }
 
     public UUID getPaymentMethodId() {
@@ -168,7 +170,7 @@ public class AccountModelDao extends EntityBase {
     }
 
     public Boolean getMigrated() {
-        return isMigrated;
+        return migrated;
     }
 
     // TODO Required for making the BindBeanFactory with Introspector work
@@ -187,7 +189,7 @@ public class AccountModelDao extends EntityBase {
         sb.append(", firstNameLength=").append(firstNameLength);
         sb.append(", currency=").append(currency);
         sb.append(", billingCycleDayLocal=").append(billingCycleDayLocal);
-        sb.append(", billingCycleDayUTC=").append(billingCycleDayUTC);
+        sb.append(", billingCycleDayUTC=").append(billingCycleDayUtc);
         sb.append(", paymentMethodId=").append(paymentMethodId);
         sb.append(", timeZone=").append(timeZone);
         sb.append(", locale='").append(locale).append('\'');
@@ -199,7 +201,7 @@ public class AccountModelDao extends EntityBase {
         sb.append(", country='").append(country).append('\'');
         sb.append(", postalCode='").append(postalCode).append('\'');
         sb.append(", phone='").append(phone).append('\'');
-        sb.append(", isMigrated=").append(isMigrated);
+        sb.append(", migrated=").append(migrated);
         sb.append(", isNotifiedForInvoices=").append(isNotifiedForInvoices);
         sb.append('}');
         return sb.toString();
@@ -222,7 +224,7 @@ public class AccountModelDao extends EntityBase {
         if (billingCycleDayLocal != that.billingCycleDayLocal) {
             return false;
         }
-        if (billingCycleDayUTC != that.billingCycleDayUTC) {
+        if (billingCycleDayUtc != that.billingCycleDayUtc) {
             return false;
         }
         if (address1 != null ? !address1.equals(that.address1) : that.address1 != null) {
@@ -252,7 +254,7 @@ public class AccountModelDao extends EntityBase {
         if (firstNameLength != null ? !firstNameLength.equals(that.firstNameLength) : that.firstNameLength != null) {
             return false;
         }
-        if (isMigrated != null ? !isMigrated.equals(that.isMigrated) : that.isMigrated != null) {
+        if (migrated != null ? !migrated.equals(that.migrated) : that.migrated != null) {
             return false;
         }
         if (isNotifiedForInvoices != null ? !isNotifiedForInvoices.equals(that.isNotifiedForInvoices) : that.isNotifiedForInvoices != null) {
@@ -292,7 +294,7 @@ public class AccountModelDao extends EntityBase {
         result = 31 * result + (firstNameLength != null ? firstNameLength.hashCode() : 0);
         result = 31 * result + (currency != null ? currency.hashCode() : 0);
         result = 31 * result + billingCycleDayLocal;
-        result = 31 * result + billingCycleDayUTC;
+        result = 31 * result + billingCycleDayUtc;
         result = 31 * result + (paymentMethodId != null ? paymentMethodId.hashCode() : 0);
         result = 31 * result + (timeZone != null ? timeZone.hashCode() : 0);
         result = 31 * result + (locale != null ? locale.hashCode() : 0);
@@ -304,7 +306,7 @@ public class AccountModelDao extends EntityBase {
         result = 31 * result + (country != null ? country.hashCode() : 0);
         result = 31 * result + (postalCode != null ? postalCode.hashCode() : 0);
         result = 31 * result + (phone != null ? phone.hashCode() : 0);
-        result = 31 * result + (isMigrated != null ? isMigrated.hashCode() : 0);
+        result = 31 * result + (migrated != null ? migrated.hashCode() : 0);
         result = 31 * result + (isNotifiedForInvoices != null ? isNotifiedForInvoices.hashCode() : 0);
         return result;
     }

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
index 7e86da0..dbc3892 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
@@ -22,18 +22,15 @@ import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.BindBean;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.SqlUpdate;
-import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
 
 import com.ning.billing.util.audit.ChangeType;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.dao.UuidMapper;
 import com.ning.billing.util.entity.dao.Audited;
 import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoStringTemplate;
 
 @EntitySqlDaoStringTemplate
-@RegisterMapper({UuidMapper.class, AccountModelDaoMapper.class})
 public interface AccountSqlDao extends EntitySqlDao<AccountModelDao> {
 
     @SqlQuery

diff --git a/account/src/main/java/com/ning/billing/account/dao/DefaultAccountEmailDao.java b/account/src/main/java/com/ning/billing/account/dao/DefaultAccountEmailDao.java
index d77561b..57378fd 100644
--- a/account/src/main/java/com/ning/billing/account/dao/DefaultAccountEmailDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/DefaultAccountEmailDao.java
@@ -23,7 +23,6 @@ import org.skife.jdbi.v2.IDBI;
 
 import com.ning.billing.ErrorCode;
 import com.ning.billing.account.api.AccountApiException;
-import com.ning.billing.account.api.AccountEmail;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.entity.dao.EntityDaoBase;
@@ -34,7 +33,7 @@ import com.ning.billing.util.entity.dao.EntitySqlDaoWrapperFactory;
 
 import com.google.inject.Inject;
 
-public class DefaultAccountEmailDao extends EntityDaoBase<AccountEmail, AccountApiException> implements AccountEmailDao {
+public class DefaultAccountEmailDao extends EntityDaoBase<AccountEmailModelDao, AccountApiException> implements AccountEmailDao {
 
     @Inject
     public DefaultAccountEmailDao(final IDBI dbi) {
@@ -42,7 +41,7 @@ public class DefaultAccountEmailDao extends EntityDaoBase<AccountEmail, AccountA
     }
 
     @Override
-    public void delete(final AccountEmail email, final InternalCallContext context) {
+    public void delete(final AccountEmailModelDao email, final InternalCallContext context) {
         transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<Void>() {
             @Override
             public Void inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
@@ -53,17 +52,17 @@ public class DefaultAccountEmailDao extends EntityDaoBase<AccountEmail, AccountA
     }
 
     @Override
-    public List<AccountEmail> getByAccountId(final UUID accountId, final InternalTenantContext context) {
-        return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<AccountEmail>>() {
+    public List<AccountEmailModelDao> getByAccountId(final UUID accountId, final InternalTenantContext context) {
+        return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<AccountEmailModelDao>>() {
             @Override
-            public List<AccountEmail> inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
+            public List<AccountEmailModelDao> inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
                 return entitySqlDaoWrapperFactory.become(AccountEmailSqlDao.class).getEmailByAccountId(accountId, context);
             }
         });
     }
 
     @Override
-    protected AccountApiException generateAlreadyExistsException(final AccountEmail entity, final InternalCallContext context) {
+    protected AccountApiException generateAlreadyExistsException(final AccountEmailModelDao entity, final InternalCallContext context) {
         return new AccountApiException(ErrorCode.ACCOUNT_EMAIL_ALREADY_EXISTS, entity.getId());
     }
 }

diff --git a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
index 88f3ec4..7a61009 100644
--- a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
+++ b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
@@ -38,7 +38,7 @@ tableValues() ::= <<
 , :firstNameLength
 , :currency
 , :billingCycleDayLocal
-, :billingCycleDayUTC
+, :billingCycleDayUtc
 , :paymentMethodId
 , :timeZone
 , :locale
@@ -65,7 +65,7 @@ accountRecordIdValueWithComma(prefix) ::= ""
 update() ::= <<
     UPDATE accounts
     SET email = :email, name = :name, first_name_length = :firstNameLength,
-        currency = :currency, billing_cycle_day_local = :billingCycleDayLocal, billing_cycle_day_utc = :billingCycleDayUTC,
+        currency = :currency, billing_cycle_day_local = :billingCycleDayLocal, billing_cycle_day_utc = :billingCycleDayUtc,
         payment_method_id = :paymentMethodId, time_zone = :timeZone, locale = :locale,
         address1 = :address1, address2 = :address2, company_name = :companyName, city = :city, state_or_province = :stateOrProvince,
         country = :country, postal_code = :postalCode, phone = :phone,

diff --git a/account/src/test/java/com/ning/billing/account/api/user/TestDefaultAccountUserApi.java b/account/src/test/java/com/ning/billing/account/api/user/TestDefaultAccountUserApi.java
index 860ad1f..0f4392e 100644
--- a/account/src/test/java/com/ning/billing/account/api/user/TestDefaultAccountUserApi.java
+++ b/account/src/test/java/com/ning/billing/account/api/user/TestDefaultAccountUserApi.java
@@ -96,7 +96,7 @@ public class TestDefaultAccountUserApi extends AccountTestSuite {
         Assert.assertEquals(account.getFirstNameLength(), firstNameLength);
         Assert.assertEquals(account.getCurrency(), currency);
         Assert.assertEquals(account.getBillingCycleDayLocal(), billCycleDay.getDayOfMonthLocal());
-        Assert.assertEquals(account.getBillingCycleDayUTC(), billCycleDay.getDayOfMonthUTC());
+        Assert.assertEquals(account.getBillingCycleDayUtc(), billCycleDay.getDayOfMonthUTC());
         Assert.assertEquals(account.getPaymentMethodId(), paymentMethodId);
         Assert.assertEquals(account.getTimeZone(), timeZone);
         Assert.assertEquals(account.getLocale(), locale);

diff --git a/account/src/test/java/com/ning/billing/account/dao/MockAccountEmailDao.java b/account/src/test/java/com/ning/billing/account/dao/MockAccountEmailDao.java
index f408592..b8a0a70 100644
--- a/account/src/test/java/com/ning/billing/account/dao/MockAccountEmailDao.java
+++ b/account/src/test/java/com/ning/billing/account/dao/MockAccountEmailDao.java
@@ -22,17 +22,16 @@ import java.util.Map;
 import java.util.UUID;
 
 import com.ning.billing.account.api.AccountApiException;
-import com.ning.billing.account.api.AccountEmail;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.entity.dao.MockEntityDaoBase;
 
-public class MockAccountEmailDao extends MockEntityDaoBase<AccountEmail, AccountApiException> implements AccountEmailDao {
+public class MockAccountEmailDao extends MockEntityDaoBase<AccountEmailModelDao, AccountApiException> implements AccountEmailDao {
 
     @Override
-    public List<AccountEmail> getByAccountId(final UUID accountId, final InternalTenantContext context) {
-        final List<AccountEmail> accountEmails = new ArrayList<AccountEmail>();
-        for (final Map<Long, AccountEmail> accountEmail : entities.values()) {
-            final AccountEmail email = accountEmail.values().iterator().next();
+    public List<AccountEmailModelDao> getByAccountId(final UUID accountId, final InternalTenantContext context) {
+        final List<AccountEmailModelDao> accountEmails = new ArrayList<AccountEmailModelDao>();
+        for (final Map<Long, AccountEmailModelDao> accountEmail : entities.values()) {
+            final AccountEmailModelDao email = accountEmail.values().iterator().next();
             if (email.getAccountId().equals(accountId)) {
                 accountEmails.add(email);
             }

diff --git a/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java b/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
index f4197a7..d804410 100644
--- a/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
+++ b/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
@@ -37,10 +37,8 @@ import com.ning.billing.account.api.DefaultBillCycleDay;
 import com.ning.billing.account.api.MutableAccountData;
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.mock.MockAccountBuilder;
-import com.ning.billing.util.api.AuditLevel;
 import com.ning.billing.util.api.CustomFieldApiException;
 import com.ning.billing.util.api.TagApiException;
-import com.ning.billing.util.audit.AuditLog;
 import com.ning.billing.util.audit.dao.AuditDao;
 import com.ning.billing.util.audit.dao.DefaultAuditDao;
 import com.ning.billing.util.clock.DefaultClock;
@@ -48,7 +46,6 @@ import com.ning.billing.util.customfield.CustomField;
 import com.ning.billing.util.customfield.StringCustomField;
 import com.ning.billing.util.customfield.dao.AuditedCustomFieldDao;
 import com.ning.billing.util.customfield.dao.CustomFieldDao;
-import com.ning.billing.util.dao.TableName;
 import com.ning.billing.util.entity.EntityPersistenceException;
 import com.ning.billing.util.tag.ControlTagType;
 import com.ning.billing.util.tag.DefaultControlTag;
@@ -206,7 +203,7 @@ public class TestAccountDao extends AccountDaoTestBase {
         assertEquals(savedAccount.getEmail(), updatedAccount.getEmail());
         assertEquals(savedAccount.getPaymentMethodId(), updatedAccount.getPaymentMethodId());
         assertEquals(savedAccount.getBillingCycleDayLocal(), updatedAccount.getBillingCycleDayLocal());
-        assertEquals(savedAccount.getBillingCycleDayUTC(), updatedAccount.getBillingCycleDayUTC());
+        assertEquals(savedAccount.getBillingCycleDayUtc(), updatedAccount.getBillingCycleDayUtc());
         assertEquals(savedAccount.getFirstNameLength(), updatedAccount.getFirstNameLength());
         assertEquals(savedAccount.getTimeZone(), updatedAccount.getTimeZone());
         assertEquals(savedAccount.getLocale(), updatedAccount.getLocale());
@@ -307,7 +304,7 @@ public class TestAccountDao extends AccountDaoTestBase {
         otherAccount.setBillCycleDay(new BillCycleDay() {
             @Override
             public int getDayOfMonthUTC() {
-                return account.getBillingCycleDayUTC();
+                return account.getBillingCycleDayUtc();
             }
 
             @Override
@@ -323,7 +320,7 @@ public class TestAccountDao extends AccountDaoTestBase {
         Assert.assertEquals(newFetchedAccount.getAddress1(), newAccount.getAddress1());
         Assert.assertEquals(newFetchedAccount.getEmail(), newAccount.getEmail());
         // Same BCD
-        Assert.assertEquals(newFetchedAccount.getBillingCycleDayUTC(), account.getBillingCycleDayUTC());
+        Assert.assertEquals(newFetchedAccount.getBillingCycleDayUtc(), account.getBillingCycleDayUtc());
         Assert.assertEquals(newFetchedAccount.getBillingCycleDayLocal(), account.getBillingCycleDayLocal());
     }
 
@@ -342,7 +339,7 @@ public class TestAccountDao extends AccountDaoTestBase {
 
         // Same BCD (zero/zero)
         final AccountModelDao retrievedAccount = accountDao.getById(account.getId(), internalCallContext);
-        Assert.assertEquals(retrievedAccount.getBillingCycleDayUTC(), fetchedAccount.getBillingCycleDayUTC());
+        Assert.assertEquals(retrievedAccount.getBillingCycleDayUtc(), fetchedAccount.getBillingCycleDayUtc());
         Assert.assertEquals(retrievedAccount.getBillingCycleDayLocal(), fetchedAccount.getBillingCycleDayLocal());
     }
 
@@ -352,11 +349,12 @@ public class TestAccountDao extends AccountDaoTestBase {
         final AccountEmail email = new DefaultAccountEmail(accountId, "test@gmail.com");
         Assert.assertEquals(accountEmailDao.getByAccountId(accountId, internalCallContext).size(), 0);
 
-        accountEmailDao.create(email, internalCallContext);
+        final AccountEmailModelDao accountEmailModelDao = new AccountEmailModelDao(email);
+        accountEmailDao.create(accountEmailModelDao, internalCallContext);
         Assert.assertEquals(accountEmailDao.getByAccountId(accountId, internalCallContext).size(), 1);
 
         try {
-            accountEmailDao.create(email, internalCallContext);
+            accountEmailDao.create(accountEmailModelDao, internalCallContext);
             Assert.fail();
         } catch (TransactionFailedException e) {
             Assert.assertTrue(e.getCause() instanceof AccountApiException);
@@ -366,24 +364,25 @@ public class TestAccountDao extends AccountDaoTestBase {
 
     @Test(groups = "slow")
     public void testAccountEmail() throws AccountApiException {
-        List<AccountEmail> emails;
+        List<AccountEmailModelDao> emails;
 
         // generate random account id
         final UUID accountId = UUID.randomUUID();
 
         // add a new e-mail
         final AccountEmail email = new DefaultAccountEmail(accountId, "test@gmail.com");
-        accountEmailDao.create(email, internalCallContext);
+        accountEmailDao.create(new AccountEmailModelDao(email), internalCallContext);
         emails = accountEmailDao.getByAccountId(accountId, internalCallContext);
         assertEquals(emails.size(), 1);
 
         // verify that audit contains one entry
         final AuditDao audit = new DefaultAuditDao(dbi);
-        final List<AuditLog> auditLogs = audit.getAuditLogsForId(TableName.ACCOUNT_EMAIL, email.getId(), AuditLevel.FULL, internalCallContext);
-        assertEquals(auditLogs.size(), 1);
+        // TODO - uncomment when TableName story is fixed
+        //final List<AuditLog> auditLogs = audit.getAuditLogsForId(TableName.ACCOUNT_EMAIL, email.getId(), AuditLevel.FULL, internalCallContext);
+        //assertEquals(auditLogs.size(), 1);
 
         // delete e-mail
-        accountEmailDao.delete(email, internalCallContext);
+        accountEmailDao.delete(new AccountEmailModelDao(email), internalCallContext);
 
         emails = accountEmailDao.getByAccountId(accountId, internalCallContext);
         assertEquals(emails.size(), 0);
@@ -400,16 +399,16 @@ public class TestAccountDao extends AccountDaoTestBase {
 
         // Add a new e-mail
         final AccountEmail accountEmail1 = new DefaultAccountEmail(accountId, email1);
-        accountEmailDao.create(accountEmail1, internalCallContext);
-        final List<AccountEmail> firstEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
+        accountEmailDao.create(new AccountEmailModelDao(accountEmail1), internalCallContext);
+        final List<AccountEmailModelDao> firstEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
         assertEquals(firstEmails.size(), 1);
         assertEquals(firstEmails.get(0).getAccountId(), accountId);
         assertEquals(firstEmails.get(0).getEmail(), email1);
 
         // Add a second e-mail
         final AccountEmail accountEmail2 = new DefaultAccountEmail(accountId, email2);
-        accountEmailDao.create(accountEmail2, internalCallContext);
-        final List<AccountEmail> secondEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
+        accountEmailDao.create(new AccountEmailModelDao(accountEmail2), internalCallContext);
+        final List<AccountEmailModelDao> secondEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
         assertEquals(secondEmails.size(), 2);
         assertTrue(secondEmails.get(0).getAccountId().equals(accountId));
         assertTrue(secondEmails.get(1).getAccountId().equals(accountId));
@@ -417,8 +416,8 @@ public class TestAccountDao extends AccountDaoTestBase {
         assertTrue(secondEmails.get(1).getEmail().equals(email1) || secondEmails.get(1).getEmail().equals(email2));
 
         // Delete the first e-mail
-        accountEmailDao.delete(accountEmail1, internalCallContext);
-        final List<AccountEmail> thirdEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
+        accountEmailDao.delete(new AccountEmailModelDao(accountEmail1), internalCallContext);
+        final List<AccountEmailModelDao> thirdEmails = accountEmailDao.getByAccountId(accountId, internalCallContext);
         assertEquals(thirdEmails.size(), 1);
         assertEquals(thirdEmails.get(0).getAccountId(), accountId);
         assertEquals(thirdEmails.get(0).getEmail(), email2);

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
index e3bad10..308e646 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
@@ -41,6 +41,7 @@ import com.ning.billing.invoice.model.RecurringInvoiceItem;
 import com.ning.billing.invoice.notification.NextBillingDatePoster;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
+import com.ning.billing.util.entity.EntityPersistenceException;
 import com.ning.billing.util.entity.dao.EntityDaoBase;
 import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoTransactionWrapper;
@@ -831,7 +832,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, InvoiceApi
      */
     private void insertItemAndAddCBAIfNeeded(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory,
                                              final InvoiceItemModelDao item,
-                                             final InternalCallContext context) {
+                                             final InternalCallContext context) throws EntityPersistenceException {
         final InvoiceItemSqlDao transInvoiceItemDao = entitySqlDaoWrapperFactory.become(InvoiceItemSqlDao.class);
         transInvoiceItemDao.create(item, context);
 
@@ -847,7 +848,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, InvoiceApi
      */
     private void addCBAIfNeeded(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory,
                                 final UUID invoiceId,
-                                final InternalCallContext context) {
+                                final InternalCallContext context) throws EntityPersistenceException {
         final InvoiceModelDao invoice = entitySqlDaoWrapperFactory.become(InvoiceSqlDao.class).getById(invoiceId.toString(), context);
         if (invoice != null) {
             populateChildren(invoice, entitySqlDaoWrapperFactory, context);

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemModelDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemModelDao.java
index c0a6804..99a342b 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemModelDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemModelDao.java
@@ -29,19 +29,21 @@ import com.ning.billing.util.entity.EntityBase;
 
 public class InvoiceItemModelDao extends EntityBase {
 
-    private final InvoiceItemType type;
-    private final UUID invoiceId;
-    private final UUID accountId;
-    private final UUID bundleId;
-    private final UUID subscriptionId;
-    private final String planName;
-    private final String phaseName;
-    private final LocalDate startDate;
-    private final LocalDate endDate;
-    private final BigDecimal amount;
-    private final BigDecimal rate;
-    private final Currency currency;
-    private final UUID linkedItemId;
+    private InvoiceItemType type;
+    private UUID invoiceId;
+    private UUID accountId;
+    private UUID bundleId;
+    private UUID subscriptionId;
+    private String planName;
+    private String phaseName;
+    private LocalDate startDate;
+    private LocalDate endDate;
+    private BigDecimal amount;
+    private BigDecimal rate;
+    private Currency currency;
+    private UUID linkedItemId;
+
+    public InvoiceItemModelDao() { /* For the DAO mapper */ }
 
     public InvoiceItemModelDao(final UUID id, final DateTime createdDate, final InvoiceItemType type, final UUID invoiceId,
                                final UUID accountId, final UUID bundleId, final UUID subscriptionId, final String planName,

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemSqlDao.java
index 431d946..6eda367 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceItemSqlDao.java
@@ -16,35 +16,17 @@
 
 package com.ning.billing.invoice.dao;
 
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
-import java.util.UUID;
 
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.BindBean;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
-import org.skife.jdbi.v2.sqlobject.SqlUpdate;
-import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
-import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.InvoiceItemType;
-import com.ning.billing.invoice.dao.InvoiceItemSqlDao.InvoiceItemModelDaoSqlDaoMapper;
-import com.ning.billing.util.audit.ChangeType;
-import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.dao.MapperBase;
-import com.ning.billing.util.entity.dao.Audited;
 import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoStringTemplate;
 
 @EntitySqlDaoStringTemplate
-@RegisterMapper(InvoiceItemModelDaoSqlDaoMapper.class)
 public interface InvoiceItemSqlDao extends EntitySqlDao<InvoiceItemModelDao> {
 
     @SqlQuery
@@ -58,35 +40,4 @@ public interface InvoiceItemSqlDao extends EntitySqlDao<InvoiceItemModelDao> {
     @SqlQuery
     List<InvoiceItemModelDao> getInvoiceItemsBySubscription(@Bind("subscriptionId") final String subscriptionId,
                                                             @BindBean final InternalTenantContext context);
-
-    @Override
-    @SqlUpdate
-    @Audited(ChangeType.INSERT)
-    void create(@BindBean final InvoiceItemModelDao invoiceItem,
-                @BindBean final InternalCallContext context);
-
-    public static class InvoiceItemModelDaoSqlDaoMapper extends MapperBase implements ResultSetMapper<InvoiceItemModelDao> {
-
-        @Override
-        public InvoiceItemModelDao map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
-            final UUID id = getUUID(result, "id");
-            final InvoiceItemType type = InvoiceItemType.valueOf(result.getString("type"));
-            final UUID invoiceId = getUUID(result, "invoice_id");
-            final UUID accountId = getUUID(result, "account_id");
-            final UUID subscriptionId = getUUID(result, "subscription_id");
-            final UUID bundleId = getUUID(result, "bundle_id");
-            final String planName = result.getString("plan_name");
-            final String phaseName = result.getString("phase_name");
-            final LocalDate startDate = getDate(result, "start_date");
-            final LocalDate endDate = getDate(result, "end_date");
-            final BigDecimal amount = result.getBigDecimal("amount");
-            final BigDecimal rate = result.getBigDecimal("rate");
-            final Currency currency = Currency.valueOf(result.getString("currency"));
-            final UUID linkedItemId = getUUID(result, "linked_item_id");
-            final DateTime createdDate = getDateTime(result, "created_date");
-
-            return new InvoiceItemModelDao(id, createdDate, type, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName,
-                                           startDate, endDate, amount, rate, currency, linkedItemId);
-        }
-    }
 }

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceModelDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceModelDao.java
index e648f9c..f21f64c 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceModelDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceModelDao.java
@@ -30,17 +30,19 @@ import com.ning.billing.util.entity.EntityBase;
 
 public class InvoiceModelDao extends EntityBase {
 
-    private final UUID accountId;
-    private final Integer invoiceNumber;
-    private final LocalDate invoiceDate;
-    private final LocalDate targetDate;
-    private final Currency currency;
-    private final boolean migrated;
+    private UUID accountId;
+    private Integer invoiceNumber;
+    private LocalDate invoiceDate;
+    private LocalDate targetDate;
+    private Currency currency;
+    private boolean migrated;
 
     // Note in the database, for convenience only
     private List<InvoiceItemModelDao> invoiceItems;
     private List<InvoicePaymentModelDao> invoicePayments;
 
+    public InvoiceModelDao() { /* For the DAO mapper */ }
+
     public InvoiceModelDao(final UUID id, @Nullable final DateTime createdDate, final UUID accountId,
                            @Nullable final Integer invoiceNumber, final LocalDate invoiceDate, final LocalDate targetDate,
                            final Currency currency, final boolean migrated) {

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentModelDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentModelDao.java
index b723367..2e9af69 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentModelDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentModelDao.java
@@ -28,14 +28,16 @@ import com.ning.billing.util.entity.EntityBase;
 
 public class InvoicePaymentModelDao extends EntityBase {
 
-    private final InvoicePaymentType type;
-    private final UUID invoiceId;
-    private final UUID paymentId;
-    private final DateTime paymentDate;
-    private final BigDecimal amount;
-    private final Currency currency;
-    private final UUID paymentCookieId;
-    private final UUID linkedInvoicePaymentId;
+    private InvoicePaymentType type;
+    private UUID invoiceId;
+    private UUID paymentId;
+    private DateTime paymentDate;
+    private BigDecimal amount;
+    private Currency currency;
+    private UUID paymentCookieId;
+    private UUID linkedInvoicePaymentId;
+
+    public InvoicePaymentModelDao() { /* For the DAO mapper */ }
 
     public InvoicePaymentModelDao(final UUID id, final DateTime createdDate, final InvoicePaymentType type, final UUID invoiceId,
                                   final UUID paymentId, final DateTime paymentDate, final BigDecimal amount, final Currency currency,

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
index 6cf88b6..a2b9f08 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoicePaymentSqlDao.java
@@ -17,34 +17,24 @@
 package com.ning.billing.invoice.dao;
 
 import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.joda.time.DateTime;
-import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.BindBean;
 import org.skife.jdbi.v2.sqlobject.SqlBatch;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
-import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.InvoicePayment.InvoicePaymentType;
-import com.ning.billing.invoice.dao.InvoicePaymentSqlDao.InvoicePaymentModelDaoMapper;
 import com.ning.billing.util.audit.ChangeType;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.dao.MapperBase;
 import com.ning.billing.util.dao.UuidMapper;
 import com.ning.billing.util.entity.dao.Audited;
 import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoStringTemplate;
 
 @EntitySqlDaoStringTemplate
-@RegisterMapper(InvoicePaymentModelDaoMapper.class)
 public interface InvoicePaymentSqlDao extends EntitySqlDao<InvoicePaymentModelDao> {
 
     @SqlQuery
@@ -84,25 +74,4 @@ public interface InvoicePaymentSqlDao extends EntitySqlDao<InvoicePaymentModelDa
     @SqlQuery
     List<InvoicePaymentModelDao> getChargebacksByPaymentId(@Bind("paymentId") final String paymentId,
                                                            @BindBean final InternalTenantContext context);
-
-    public static class InvoicePaymentModelDaoMapper extends MapperBase implements ResultSetMapper<InvoicePaymentModelDao> {
-
-        @Override
-        public InvoicePaymentModelDao map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
-            final UUID id = getUUID(result, "id");
-            final InvoicePaymentType type = InvoicePaymentType.valueOf(result.getString("type"));
-            final UUID paymentId = getUUID(result, "payment_id");
-            final UUID invoiceId = getUUID(result, "invoice_id");
-            final DateTime paymentDate = getDateTime(result, "payment_date");
-            final BigDecimal amount = result.getBigDecimal("amount");
-            final String currencyString = result.getString("currency");
-            final Currency currency = (currencyString == null) ? null : Currency.valueOf(currencyString);
-            final UUID paymentCookieId = getUUID(result, "payment_cookie_id");
-            final UUID linkedInvoicePaymentId = getUUID(result, "linked_invoice_payment_id");
-            final DateTime createdDate = getDateTime(result, "created_date");
-
-            return new InvoicePaymentModelDao(id, createdDate, type, invoiceId, paymentId, paymentDate,
-                                              amount, currency, paymentCookieId, linkedInvoicePaymentId);
-        }
-    }
 }

diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
index 5d4dd09..863add6 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
@@ -16,31 +16,19 @@
 
 package com.ning.billing.invoice.dao;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.BindBean;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
-import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
-import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.dao.InvoiceSqlDao.InvoiceModelDaoMapper;
 import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.dao.MapperBase;
-import com.ning.billing.util.dao.UuidMapper;
 import com.ning.billing.util.entity.dao.EntitySqlDao;
 import com.ning.billing.util.entity.dao.EntitySqlDaoStringTemplate;
 
 @EntitySqlDaoStringTemplate
-@RegisterMapper({InvoiceModelDaoMapper.class, UuidMapper.class})
 public interface InvoiceSqlDao extends EntitySqlDao<InvoiceModelDao> {
 
     @SqlQuery
@@ -63,22 +51,5 @@ public interface InvoiceSqlDao extends EntitySqlDao<InvoiceModelDao> {
     @SqlQuery
     UUID getInvoiceIdByPaymentId(@Bind("paymentId") final String paymentId,
                                  @BindBean final InternalTenantContext context);
-
-    public static class InvoiceModelDaoMapper extends MapperBase implements ResultSetMapper<InvoiceModelDao> {
-
-        @Override
-        public InvoiceModelDao map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
-            final UUID id = UUID.fromString(result.getString("id"));
-            final UUID accountId = UUID.fromString(result.getString("account_id"));
-            final int invoiceNumber = result.getInt("invoice_number");
-            final LocalDate invoiceDate = getDate(result, "invoice_date");
-            final LocalDate targetDate = getDate(result, "target_date");
-            final Currency currency = Currency.valueOf(result.getString("currency"));
-            final boolean isMigrationInvoice = result.getBoolean("migrated");
-            final DateTime createdDate = getDateTime(result, "created_date");
-
-            return new InvoiceModelDao(id, createdDate, accountId, invoiceNumber, invoiceDate, targetDate, currency, isMigrationInvoice);
-        }
-    }
 }
 

diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
index 6ed7402..c4dd373 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
@@ -45,7 +45,6 @@ import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.config.InvoiceConfig;
 import com.ning.billing.util.entity.EntityPersistenceException;
 import com.ning.billing.util.svcsapi.bus.InternalBus;
-import com.ning.billing.util.tag.api.user.TagEventBuilder;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
@@ -56,8 +55,6 @@ import static org.testng.Assert.assertTrue;
 
 public class InvoiceDaoTestBase extends InvoicingTestBase {
 
-    protected final TagEventBuilder tagEventBuilder = new TagEventBuilder();
-
     protected IDBI dbi;
     protected InvoiceDao invoiceDao;
     protected InvoiceItemSqlDao invoiceItemSqlDao;
@@ -137,7 +134,7 @@ public class InvoiceDaoTestBase extends InvoicingTestBase {
         }
     }
 
-    protected void createInvoiceItem(final InvoiceItem invoiceItem, final InternalCallContext internalCallContext) {
+    protected void createInvoiceItem(final InvoiceItem invoiceItem, final InternalCallContext internalCallContext) throws EntityPersistenceException {
         invoiceItemSqlDao.create(new InvoiceItemModelDao(invoiceItem), internalCallContext);
     }
 

diff --git a/invoice/src/test/java/com/ning/billing/invoice/tests/InvoiceTestUtils.java b/invoice/src/test/java/com/ning/billing/invoice/tests/InvoiceTestUtils.java
index e281c2b..b7bc6cb 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/tests/InvoiceTestUtils.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/tests/InvoiceTestUtils.java
@@ -55,8 +55,13 @@ public class InvoiceTestUtils {
                                                   final Currency currency,
                                                   final CallContext callContext,
                                                   final InternalCallContextFactory internalCallContextFactory) {
-        return createAndPersistInvoice(invoiceSqlDao, invoiceItemSqlDao, clock, ImmutableList.<BigDecimal>of(amount),
-                                       currency, callContext, internalCallContextFactory);
+        try {
+            return createAndPersistInvoice(invoiceSqlDao, invoiceItemSqlDao, clock, ImmutableList.<BigDecimal>of(amount),
+                                           currency, callContext, internalCallContextFactory);
+        } catch (EntityPersistenceException e) {
+            Assert.fail(e.getMessage());
+            return null;
+        }
     }
 
     public static Invoice createAndPersistInvoice(final InvoiceSqlDao invoiceSqlDao,
@@ -65,7 +70,7 @@ public class InvoiceTestUtils {
                                                   final List<BigDecimal> amounts,
                                                   final Currency currency,
                                                   final CallContext callContext,
-                                                  final InternalCallContextFactory internalCallContextFactory) {
+                                                  final InternalCallContextFactory internalCallContextFactory) throws EntityPersistenceException {
         final Invoice invoice = Mockito.mock(Invoice.class);
         final UUID invoiceId = UUID.randomUUID();
         final UUID accountId = UUID.randomUUID();

diff --git a/util/src/main/java/com/ning/billing/util/dao/LowerToCamelBeanMapper.java b/util/src/main/java/com/ning/billing/util/dao/LowerToCamelBeanMapper.java
new file mode 100644
index 0000000..17f2c97
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/dao/LowerToCamelBeanMapper.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.dao;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
+import org.skife.jdbi.v2.StatementContext;
+import org.skife.jdbi.v2.tweak.ResultSetMapper;
+
+import com.google.common.base.CaseFormat;
+
+// Identical to org.skife.jdbi.v2.BeanMapper but maps created_date to createdDate
+public class LowerToCamelBeanMapper<T> implements ResultSetMapper<T> {
+
+    private final Class<T> type;
+    private final Map<String, PropertyDescriptor> properties = new HashMap<String, PropertyDescriptor>();
+
+    public LowerToCamelBeanMapper(final Class<T> type) {
+        this.type = type;
+        try {
+            final BeanInfo info = Introspector.getBeanInfo(type);
+
+            for (final PropertyDescriptor descriptor : info.getPropertyDescriptors()) {
+                properties.put(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, descriptor.getName()).toLowerCase(), descriptor);
+            }
+        } catch (IntrospectionException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    public T map(final int row, final ResultSet rs, final StatementContext ctx) throws SQLException {
+        final T bean;
+        try {
+            bean = type.newInstance();
+        } catch (Exception e) {
+            throw new IllegalArgumentException(String.format("A bean, %s, was mapped " +
+                                                             "which was not instantiable", type.getName()),
+                                               e);
+        }
+
+        final Class beanClass = bean.getClass();
+        final ResultSetMetaData metadata = rs.getMetaData();
+
+        for (int i = 1; i <= metadata.getColumnCount(); ++i) {
+            final String name = metadata.getColumnName(i).toLowerCase();
+
+            final PropertyDescriptor descriptor = properties.get(name);
+
+            if (descriptor != null) {
+                final Class<?> type = descriptor.getPropertyType();
+
+                Object value;
+
+                if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
+                    value = rs.getBoolean(i);
+                } else if (type.isAssignableFrom(Byte.class) || type.isAssignableFrom(byte.class)) {
+                    value = rs.getByte(i);
+                } else if (type.isAssignableFrom(Short.class) || type.isAssignableFrom(short.class)) {
+                    value = rs.getShort(i);
+                } else if (type.isAssignableFrom(Integer.class) || type.isAssignableFrom(int.class)) {
+                    value = rs.getInt(i);
+                } else if (type.isAssignableFrom(Long.class) || type.isAssignableFrom(long.class)) {
+                    value = rs.getLong(i);
+                } else if (type.isAssignableFrom(Float.class) || type.isAssignableFrom(float.class)) {
+                    value = rs.getFloat(i);
+                } else if (type.isAssignableFrom(Double.class) || type.isAssignableFrom(double.class)) {
+                    value = rs.getDouble(i);
+                } else if (type.isAssignableFrom(BigDecimal.class)) {
+                    value = rs.getBigDecimal(i);
+                } else if (type.isAssignableFrom(DateTime.class)) {
+                    final Timestamp timestamp = rs.getTimestamp(i);
+                    value = timestamp == null ? null : new DateTime(timestamp).toDateTime(DateTimeZone.UTC);
+                } else if (type.isAssignableFrom(Time.class)) {
+                    value = rs.getTime(i);
+                } else if (type.isAssignableFrom(LocalDate.class)) {
+                    final Date date = rs.getDate(i);
+                    value = date == null ? null : new LocalDate(date, DateTimeZone.UTC);
+                } else if (type.isAssignableFrom(DateTimeZone.class)) {
+                    final String dateTimeZoneString = rs.getString(i);
+                    value = dateTimeZoneString == null ? null : DateTimeZone.forID(dateTimeZoneString);
+                } else if (type.isAssignableFrom(String.class)) {
+                    value = rs.getString(i);
+                } else if (type.isAssignableFrom(UUID.class)) {
+                    final String uuidString = rs.getString(i);
+                    value = uuidString == null ? null : UUID.fromString(uuidString);
+                } else if (type.isEnum()) {
+                    final String enumString = rs.getString(i);
+                    //noinspection unchecked
+                    value = enumString == null ? null : Enum.valueOf((Class<Enum>) type, enumString);
+                } else {
+                    value = rs.getObject(i);
+                }
+
+                if (rs.wasNull() && !type.isPrimitive()) {
+                    value = null;
+                }
+
+                try {
+                    final Method writeMethod = descriptor.getWriteMethod();
+                    if (writeMethod != null) {
+                        writeMethod.invoke(bean, value);
+                    } else {
+                        final String camelCasedName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name);
+                        final Field field = getField(beanClass, camelCasedName);
+                        field.setAccessible(true); // Often private...
+                        field.set(bean, value);
+                    }
+                } catch (NoSuchFieldException e) {
+                    throw new IllegalArgumentException(String.format("Unable to find field for " +
+                                                                     "property, %s", name), e);
+                } catch (IllegalAccessException e) {
+                    throw new IllegalArgumentException(String.format("Unable to access setter for " +
+                                                                     "property, %s", name), e);
+                } catch (InvocationTargetException e) {
+                    throw new IllegalArgumentException(String.format("Invocation target exception trying to " +
+                                                                     "invoker setter for the %s property", name), e);
+                } catch (NullPointerException e) {
+                    throw new IllegalArgumentException(String.format("No appropriate method to " +
+                                                                     "write value %s ", value.toString()), e);
+                }
+            }
+        }
+
+        return bean;
+    }
+
+    private static Field getField(final Class clazz, final String fieldName) throws NoSuchFieldException {
+        try {
+            return clazz.getDeclaredField(fieldName);
+        } catch (NoSuchFieldException e) {
+            // Go up in the hierarchy
+            final Class superClass = clazz.getSuperclass();
+            if (superClass == null) {
+                throw e;
+            } else {
+                return getField(superClass, fieldName);
+            }
+        }
+    }
+}

diff --git a/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoStringTemplate.java b/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoStringTemplate.java
index 2857f9d..49e85c9 100644
--- a/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoStringTemplate.java
+++ b/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoStringTemplate.java
@@ -22,14 +22,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 
+import org.skife.jdbi.v2.Query;
 import org.skife.jdbi.v2.SQLStatement;
 import org.skife.jdbi.v2.sqlobject.SqlStatementCustomizer;
 import org.skife.jdbi.v2.sqlobject.SqlStatementCustomizingAnnotation;
+import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.StringTemplate3StatementLocator;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.UseStringTemplate3StatementLocator;
 import org.skife.jdbi.v2.tweak.StatementLocator;
 
+import com.ning.billing.util.dao.LowerToCamelBeanMapperFactory;
+import com.ning.billing.util.entity.Entity;
+
 @SqlStatementCustomizingAnnotation(EntitySqlDaoStringTemplate.EntitySqlDaoLocatorFactory.class)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
@@ -55,8 +61,30 @@ public @interface EntitySqlDaoStringTemplate {
             }
 
             return new SqlStatementCustomizer() {
-                public void apply(final SQLStatement q) {
-                    q.setStatementLocator(l);
+                public void apply(final SQLStatement statement) {
+                    statement.setStatementLocator(l);
+
+                    if (statement instanceof Query) {
+                        final Query query = (Query) statement;
+
+                        // Find the model class associated with this sqlObjectType (which is a SqlDao class) to register its mapper
+                        // If a custom mapper is defined via @RegisterMapper, don't register our generic one
+                        if (sqlObjectType.getGenericInterfaces() != null &&
+                            sqlObjectType.getAnnotation(RegisterMapper.class) == null) {
+                            for (int i = 0; i < sqlObjectType.getGenericInterfaces().length; i++) {
+                                if (sqlObjectType.getGenericInterfaces()[i] instanceof ParameterizedType) {
+                                    final ParameterizedType type = (ParameterizedType) sqlObjectType.getGenericInterfaces()[i];
+                                    for (int j = 0; j < type.getActualTypeArguments().length; j++) {
+                                        final Class modelClazz = (Class) type.getActualTypeArguments()[i];
+                                        if (Entity.class.isAssignableFrom(modelClazz)) {
+                                            query.registerMapper(new LowerToCamelBeanMapperFactory(modelClazz));
+                                        }
+                                    }
+                                }
+
+                            }
+                        }
+                    }
                 }
             };
         }

diff --git a/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoWrapperInvocationHandler.java b/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoWrapperInvocationHandler.java
index 9ba0b85..4a989ab 100644
--- a/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoWrapperInvocationHandler.java
+++ b/util/src/main/java/com/ning/billing/util/entity/dao/EntitySqlDaoWrapperInvocationHandler.java
@@ -150,7 +150,6 @@ public class EntitySqlDaoWrapperInvocationHandler<T extends EntitySqlDao<U>, U e
 
             for (final String entityId : entityIds) {
                 updateHistoryAndAudit(entityId, entities, entityRecordIds, changeType, context);
-
             }
         }
 

diff --git a/util/src/test/java/com/ning/billing/dbi/DBIProvider.java b/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
index a5d1f3f..b66f87d 100644
--- a/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
+++ b/util/src/test/java/com/ning/billing/dbi/DBIProvider.java
@@ -27,6 +27,7 @@ import com.ning.billing.util.dao.DateTimeZoneArgumentFactory;
 import com.ning.billing.util.dao.EnumArgumentFactory;
 import com.ning.billing.util.dao.LocalDateArgumentFactory;
 import com.ning.billing.util.dao.UUIDArgumentFactory;
+import com.ning.billing.util.dao.UuidMapper;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -70,6 +71,7 @@ public class DBIProvider implements Provider<IDBI> {
         dbi.registerArgumentFactory(new DateTimeArgumentFactory());
         dbi.registerArgumentFactory(new LocalDateArgumentFactory());
         dbi.registerArgumentFactory(new EnumArgumentFactory());
+        dbi.registerMapper(new UuidMapper());
 
         // Restart transactions in case of deadlocks
         dbi.setTransactionHandler(new SerializableTransactionRunner());