diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountDataImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountDataImp.java
index 31740f7e..b97b23db 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountDataImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountDataImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Currency;
 
 @JsonDeserialize( builder = AccountDataImp.Builder.class )
-public class AccountDataImp implements AccountData, Serializable {
-
-    private static final long serialVersionUID = 0x2C6389A98E22A198L;
+public class AccountDataImp implements AccountData {
 
     protected String address1;
     protected String address2;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountEmailImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountEmailImp.java
index 61e6d37d..07bdd37b 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountEmailImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountEmailImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.account.api.AccountEmail;
 
 @JsonDeserialize( builder = AccountEmailImp.Builder.class )
-public class AccountEmailImp implements AccountEmail, Serializable {
-
-    private static final long serialVersionUID = 0x89ADE56213E92CA8L;
+public class AccountEmailImp implements AccountEmail {
 
     protected UUID accountId;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountImp.java
index 38279ad8..a52a5e34 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.Currency;
 
 @JsonDeserialize( builder = AccountImp.Builder.class )
-public class AccountImp implements Account, Serializable {
-
-    private static final long serialVersionUID = 0xC04BEEB88249E4BFL;
+public class AccountImp implements Account {
 
     protected String address1;
     protected String address2;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountUserApiImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountUserApiImp.java
index 48e92d3f..01a7609b 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/AccountUserApiImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/AccountUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -36,9 +36,7 @@
 import org.killbill.billing.util.entity.Pagination;
 
 @JsonDeserialize( builder = AccountUserApiImp.Builder.class )
-public class AccountUserApiImp implements AccountUserApi, Serializable {
-
-    private static final long serialVersionUID = 0xC633864CD6FD2567L;
+public class AccountUserApiImp implements AccountUserApi {
 
 
     public AccountUserApiImp(final AccountUserApiImp that) {
@@ -55,14 +53,14 @@ public void updateAccount(final UUID accountId, final AccountData accountData, f
         throw new UnsupportedOperationException("updateAccount(java.util.UUID, org.killbill.billing.account.api.AccountData, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public List<Account> getChildrenAccounts(final UUID parentAccountId, final TenantContext context) {
-        throw new UnsupportedOperationException("getChildrenAccounts(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public List<AccountEmail> getEmails(final UUID accountId, final TenantContext context) {
         throw new UnsupportedOperationException("getEmails(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public List<Account> getChildrenAccounts(final UUID parentAccountId, final TenantContext context) {
+        throw new UnsupportedOperationException("getChildrenAccounts(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public List<AuditLogWithHistory> getEmailAuditLogsWithHistoryForId(final UUID accountEmailId, final AuditLevel auditLevel, final TenantContext context) {
         throw new UnsupportedOperationException("getEmailAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -75,22 +73,22 @@ public void updateAccount(final String key, final AccountData accountData, final
         throw new UnsupportedOperationException("updateAccount(java.lang.String, org.killbill.billing.account.api.AccountData, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public UUID getIdFromKey(final String externalKey, final TenantContext context) {
-        throw new UnsupportedOperationException("getIdFromKey(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public Account getAccountByKey(final String key, final TenantContext context) {
         throw new UnsupportedOperationException("getAccountByKey(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<AuditLogWithHistory> getAuditLogsWithHistoryForId(final UUID accountId, final AuditLevel auditLevel, final TenantContext context) {
-        throw new UnsupportedOperationException("getAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    public UUID getIdFromKey(final String externalKey, final TenantContext context) {
+        throw new UnsupportedOperationException("getIdFromKey(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
     public void removeEmail(final UUID accountId, final AccountEmail email, final CallContext context) {
         throw new UnsupportedOperationException("removeEmail(java.util.UUID, org.killbill.billing.account.api.AccountEmail, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public List<AuditLogWithHistory> getAuditLogsWithHistoryForId(final UUID accountId, final AuditLevel auditLevel, final TenantContext context) {
+        throw new UnsupportedOperationException("getAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public Pagination<Account> searchAccounts(final String searchKey, final Long offset, final Long limit, final TenantContext context) {
         throw new UnsupportedOperationException("searchAccounts(java.lang.String, java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -114,7 +112,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final AccountUserApiImp that = (AccountUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/ImmutableAccountDataImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/ImmutableAccountDataImp.java
index 4f8069a0..b26fd9e0 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/ImmutableAccountDataImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/ImmutableAccountDataImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Currency;
 
 @JsonDeserialize( builder = ImmutableAccountDataImp.Builder.class )
-public class ImmutableAccountDataImp implements ImmutableAccountData, Serializable {
-
-    private static final long serialVersionUID = 0x2FDAB7550B03310EL;
+public class ImmutableAccountDataImp implements ImmutableAccountData {
 
     protected Currency currency;
     protected String externalKey;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/account/api/boilerplate/Module.java
index df067886..af4e3cb4 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/MutableAccountDataImp.java b/src/main/java/org/killbill/billing/account/api/boilerplate/MutableAccountDataImp.java
index f7fa61fa..756fceac 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/MutableAccountDataImp.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/MutableAccountDataImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Currency;
 
 @JsonDeserialize( builder = MutableAccountDataImp.Builder.class )
-public class MutableAccountDataImp implements MutableAccountData, Serializable {
-
-    private static final long serialVersionUID = 0xD26E53FB34A75489L;
+public class MutableAccountDataImp implements MutableAccountData {
 
     protected String address1;
     protected String address2;
diff --git a/src/main/java/org/killbill/billing/account/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/account/api/boilerplate/Resolver.java
index dcbb6a38..f702e20e 100644
--- a/src/main/java/org/killbill/billing/account/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/account/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.account.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/boilerplate/KillbillApiImp.java b/src/main/java/org/killbill/billing/boilerplate/KillbillApiImp.java
index 0353c762..03d7ad4d 100644
--- a/src/main/java/org/killbill/billing/boilerplate/KillbillApiImp.java
+++ b/src/main/java/org/killbill/billing/boilerplate/KillbillApiImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.KillbillApi;
 
 @JsonDeserialize( builder = KillbillApiImp.Builder.class )
-public class KillbillApiImp implements KillbillApi, Serializable {
-
-    private static final long serialVersionUID = 0x20A7341610C22B78L;
+public class KillbillApiImp implements KillbillApi {
 
 
     public KillbillApiImp(final KillbillApiImp that) {
@@ -43,7 +41,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final KillbillApiImp that = (KillbillApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/boilerplate/Module.java b/src/main/java/org/killbill/billing/boilerplate/Module.java
index 671d22a3..400762b0 100644
--- a/src/main/java/org/killbill/billing/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.boilerplate;
diff --git a/src/main/java/org/killbill/billing/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/boilerplate/Resolver.java
index 8999defd..b84bb939 100644
--- a/src/main/java/org/killbill/billing/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.boilerplate;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockImp.java
index f5c1aad0..10a215f2 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Block;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Unit;
 
 @JsonDeserialize( builder = BlockImp.Builder.class )
-public class BlockImp implements Block, Serializable {
-
-    private static final long serialVersionUID = 0xDA423D317BA66755L;
+public class BlockImp implements Block {
 
     protected Double minTopUpCredit;
     protected InternationalPrice price;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockPriceOverrideImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockPriceOverrideImp.java
index 5243e741..a9f35140 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockPriceOverrideImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/BlockPriceOverrideImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.Currency;
 
 @JsonDeserialize( builder = BlockPriceOverrideImp.Builder.class )
-public class BlockPriceOverrideImp implements BlockPriceOverride, Serializable {
-
-    private static final long serialVersionUID = 0x3D35C7641AB97F04L;
+public class BlockPriceOverrideImp implements BlockPriceOverride {
 
     protected Currency currency;
     protected BigDecimal price;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogEntityImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogEntityImp.java
index ae5fe856..e89bcc90 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogEntityImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogEntityImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.CatalogEntity;
 
 @JsonDeserialize( builder = CatalogEntityImp.Builder.class )
-public class CatalogEntityImp implements CatalogEntity, Serializable {
-
-    private static final long serialVersionUID = 0x1EAEAFBDB03087E2L;
+public class CatalogEntityImp implements CatalogEntity {
 
     protected String name;
     protected String prettyName;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogUserApiImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogUserApiImp.java
index 36d78324..0cb78f55 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogUserApiImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/CatalogUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.joda.time.DateTime;
@@ -32,9 +32,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = CatalogUserApiImp.Builder.class )
-public class CatalogUserApiImp implements CatalogUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x3067F07C17AFFCFAL;
+public class CatalogUserApiImp implements CatalogUserApi {
 
 
     public CatalogUserApiImp(final CatalogUserApiImp that) {
@@ -43,10 +41,6 @@ protected CatalogUserApiImp(final CatalogUserApiImp.Builder<?> builder) {
     }
     protected CatalogUserApiImp() { }
     @Override
-    public void addSimplePlan(final SimplePlanDescriptor planDescriptor, final DateTime requestedDate, final CallContext context) {
-        throw new UnsupportedOperationException("addSimplePlan(org.killbill.billing.catalog.api.SimplePlanDescriptor, org.joda.time.DateTime, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public VersionedCatalog getCatalog(final String catalogName, final TenantContext context) {
         throw new UnsupportedOperationException("getCatalog(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -55,6 +49,10 @@ public StaticCatalog getCurrentCatalog(final String catalogName, final TenantCon
         throw new UnsupportedOperationException("getCurrentCatalog(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public void addSimplePlan(final SimplePlanDescriptor planDescriptor, final DateTime requestedDate, final CallContext context) {
+        throw new UnsupportedOperationException("addSimplePlan(org.killbill.billing.catalog.api.SimplePlanDescriptor, org.joda.time.DateTime, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public void createDefaultEmptyCatalog(final DateTime effectiveDate, final CallContext callContext) {
         throw new UnsupportedOperationException("createDefaultEmptyCatalog(org.joda.time.DateTime, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -74,7 +72,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final CatalogUserApiImp that = (CatalogUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/DurationImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/DurationImp.java
index 9acaa8d0..ee1b2f69 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/DurationImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/DurationImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.joda.time.DateTime;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.TimeUnit;
 
 @JsonDeserialize( builder = DurationImp.Builder.class )
-public class DurationImp implements Duration, Serializable {
-
-    private static final long serialVersionUID = 0x960B032F06518C3EL;
+public class DurationImp implements Duration {
 
     protected int number;
     protected TimeUnit unit;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/FixedImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/FixedImp.java
index 90e22d95..f6bb4622 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/FixedImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/FixedImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Fixed;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.InternationalPrice;
 
 @JsonDeserialize( builder = FixedImp.Builder.class )
-public class FixedImp implements Fixed, Serializable {
-
-    private static final long serialVersionUID = 0xE56482B05D5C48E9L;
+public class FixedImp implements Fixed {
 
     protected InternationalPrice price;
     protected FixedType type;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/InternationalPriceImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/InternationalPriceImp.java
index 765b1a96..3df2fe86 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/InternationalPriceImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/InternationalPriceImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Price;
 
 @JsonDeserialize( builder = InternationalPriceImp.Builder.class )
-public class InternationalPriceImp implements InternationalPrice, Serializable {
-
-    private static final long serialVersionUID = 0xF5CA9ADDE8F2DC3BL;
+public class InternationalPriceImp implements InternationalPrice {
 
     protected boolean isZero;
     protected Price[] prices;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/LimitImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/LimitImp.java
index 7148f9b4..1a0c6442 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/LimitImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/LimitImp.java
@@ -1,34 +1,32 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Limit;
 import org.killbill.billing.catalog.api.Unit;
 
 @JsonDeserialize( builder = LimitImp.Builder.class )
-public class LimitImp implements Limit, Serializable {
-
-    private static final long serialVersionUID = 0xEDC0423E78E935EL;
+public class LimitImp implements Limit {
 
     protected Double max;
     protected Double min;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/ListingImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/ListingImp.java
index 59cccf34..e194db04 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/ListingImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/ListingImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Listing;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.PriceList;
 
 @JsonDeserialize( builder = ListingImp.Builder.class )
-public class ListingImp implements Listing, Serializable {
-
-    private static final long serialVersionUID = 0x2C0F0703EA4BBDB7L;
+public class ListingImp implements Listing {
 
     protected Plan plan;
     protected PriceList priceList;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/MigrationPlanImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/MigrationPlanImp.java
index f50f2f10..ce9704c3 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/MigrationPlanImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/MigrationPlanImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
@@ -36,9 +36,7 @@
 import org.killbill.billing.catalog.api.StaticCatalog;
 
 @JsonDeserialize( builder = MigrationPlanImp.Builder.class )
-public class MigrationPlanImp implements MigrationPlan, Serializable {
-
-    private static final long serialVersionUID = 0xA54A95C4B62D73FCL;
+public class MigrationPlanImp implements MigrationPlan {
 
     protected PlanPhase[] allPhases;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/Module.java
index 389b84e6..16171c5a 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/MutableStaticCatalogImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/MutableStaticCatalogImp.java
index c309fe97..e7822493 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/MutableStaticCatalogImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/MutableStaticCatalogImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -40,9 +40,7 @@
 import org.killbill.billing.catalog.api.rules.PlanRules;
 
 @JsonDeserialize( builder = MutableStaticCatalogImp.Builder.class )
-public class MutableStaticCatalogImp implements MutableStaticCatalog, Serializable {
-
-    private static final long serialVersionUID = 0x12A4C42B079AD147L;
+public class MutableStaticCatalogImp implements MutableStaticCatalog {
 
     protected List<Listing> availableBasePlanListings;
     protected String catalogName;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanImp.java
index 9e3f86ea..36bb772f 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
@@ -36,9 +36,7 @@
 import org.killbill.billing.catalog.api.StaticCatalog;
 
 @JsonDeserialize( builder = PlanImp.Builder.class )
-public class PlanImp implements Plan, Serializable {
-
-    private static final long serialVersionUID = 0xF3EE496703EAF392L;
+public class PlanImp implements Plan {
 
     protected PlanPhase[] allPhases;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhaseImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhaseImp.java
index 6ef75a62..1abbf5c1 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhaseImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhaseImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Duration;
@@ -31,9 +31,7 @@
 import org.killbill.billing.catalog.api.Usage;
 
 @JsonDeserialize( builder = PlanPhaseImp.Builder.class )
-public class PlanPhaseImp implements PlanPhase, Serializable {
-
-    private static final long serialVersionUID = 0xAF49E600C9BB037DL;
+public class PlanPhaseImp implements PlanPhase {
 
     protected StaticCatalog catalog;
     protected Duration duration;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverrideImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverrideImp.java
index 45872447..91228776 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverrideImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverrideImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.UsagePriceOverride;
 
 @JsonDeserialize( builder = PlanPhasePriceOverrideImp.Builder.class )
-public class PlanPhasePriceOverrideImp implements PlanPhasePriceOverride, Serializable {
-
-    private static final long serialVersionUID = 0x7AAF7FEE20AC0469L;
+public class PlanPhasePriceOverrideImp implements PlanPhasePriceOverride {
 
     protected Currency currency;
     protected BigDecimal fixedPrice;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverridesWithCallContextImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverridesWithCallContextImp.java
index 4927b15a..9a83b9b8 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverridesWithCallContextImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PlanPhasePriceOverridesWithCallContextImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = PlanPhasePriceOverridesWithCallContextImp.Builder.class )
-public class PlanPhasePriceOverridesWithCallContextImp implements PlanPhasePriceOverridesWithCallContext, Serializable {
-
-    private static final long serialVersionUID = 0xFEAD7869462749EDL;
+public class PlanPhasePriceOverridesWithCallContextImp implements PlanPhasePriceOverridesWithCallContext {
 
     protected CallContext callContext;
     protected List<PlanPhasePriceOverride> overrides;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceImp.java
index 32c66125..b7c245c6 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.catalog.api.Price;
 
 @JsonDeserialize( builder = PriceImp.Builder.class )
-public class PriceImp implements Price, Serializable {
-
-    private static final long serialVersionUID = 0xD2B8DE0232F22E0EL;
+public class PriceImp implements Price {
 
     protected Currency currency;
     protected BigDecimal value;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListImp.java
index ec6b001d..e1ad21cd 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.StaticCatalog;
 
 @JsonDeserialize( builder = PriceListImp.Builder.class )
-public class PriceListImp implements PriceList, Serializable {
-
-    private static final long serialVersionUID = 0x5D1F2B634C3D86DCL;
+public class PriceListImp implements PriceList {
 
     protected StaticCatalog catalog;
     protected String name;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListSetImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListSetImp.java
index 4b6307dc..2be651a1 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListSetImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/PriceListSetImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.catalog.api.StaticCatalog;
 
 @JsonDeserialize( builder = PriceListSetImp.Builder.class )
-public class PriceListSetImp implements PriceListSet, Serializable {
-
-    private static final long serialVersionUID = 0x7F145FE5CA67CC48L;
+public class PriceListSetImp implements PriceListSet {
 
     protected List<PriceList> allPriceLists;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/ProductImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/ProductImp.java
index edaada33..385ccec4 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/ProductImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/ProductImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.StaticCatalog;
 
 @JsonDeserialize( builder = ProductImp.Builder.class )
-public class ProductImp implements Product, Serializable {
-
-    private static final long serialVersionUID = 0x25986204CF11F2C6L;
+public class ProductImp implements Product {
 
     protected Collection<Product> available;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/RecurringImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/RecurringImp.java
index afadc645..9a63bdca 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/RecurringImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/RecurringImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.Recurring;
 
 @JsonDeserialize( builder = RecurringImp.Builder.class )
-public class RecurringImp implements Recurring, Serializable {
-
-    private static final long serialVersionUID = 0x43536F908E82DDF9L;
+public class RecurringImp implements Recurring {
 
     protected BillingPeriod billingPeriod;
     protected InternationalPrice recurringPrice;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/Resolver.java
index a7741655..ed7cb417 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/SimplePlanDescriptorImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/SimplePlanDescriptorImp.java
index c93bea73..efec8727 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/SimplePlanDescriptorImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/SimplePlanDescriptorImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -31,9 +31,7 @@
 import org.killbill.billing.catalog.api.TimeUnit;
 
 @JsonDeserialize( builder = SimplePlanDescriptorImp.Builder.class )
-public class SimplePlanDescriptorImp implements SimplePlanDescriptor, Serializable {
-
-    private static final long serialVersionUID = 0x87AD39BFF808A74BL;
+public class SimplePlanDescriptorImp implements SimplePlanDescriptor {
 
     protected BigDecimal amount;
     protected List<String> availableBaseProducts;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/StaticCatalogImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/StaticCatalogImp.java
index 7edad5fd..831d705f 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/StaticCatalogImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/StaticCatalogImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -40,9 +40,7 @@
 import org.killbill.billing.catalog.api.rules.PlanRules;
 
 @JsonDeserialize( builder = StaticCatalogImp.Builder.class )
-public class StaticCatalogImp implements StaticCatalog, Serializable {
-
-    private static final long serialVersionUID = 0xE722A02C87A2AC87L;
+public class StaticCatalogImp implements StaticCatalog {
 
     protected List<Listing> availableBasePlanListings;
     protected String catalogName;
@@ -114,14 +112,14 @@ public Unit[] getUnits() {
         return this.units;
     }
     @Override
-    public Plan createOrFindPlan(final PlanSpecifier spec, final PlanPhasePriceOverridesWithCallContext overrides) {
-        throw new UnsupportedOperationException("createOrFindPlan(org.killbill.billing.catalog.api.PlanSpecifier, org.killbill.billing.catalog.api.PlanPhasePriceOverridesWithCallContext) must be implemented.");
-    }
-    @Override
     public Plan findPlan(final String name) {
         throw new UnsupportedOperationException("findPlan(java.lang.String) must be implemented.");
     }
     @Override
+    public Plan createOrFindPlan(final PlanSpecifier spec, final PlanPhasePriceOverridesWithCallContext overrides) {
+        throw new UnsupportedOperationException("createOrFindPlan(org.killbill.billing.catalog.api.PlanSpecifier, org.killbill.billing.catalog.api.PlanPhasePriceOverridesWithCallContext) must be implemented.");
+    }
+    @Override
     public List<Listing> getAvailableAddOnListings(final String baseProductName, final String priceListName) {
         throw new UnsupportedOperationException("getAvailableAddOnListings(java.lang.String, java.lang.String) must be implemented.");
     }
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierImp.java
index 99698b7c..05c28674 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.InternationalPrice;
@@ -28,9 +28,7 @@
 import org.killbill.billing.catalog.api.TieredBlock;
 
 @JsonDeserialize( builder = TierImp.Builder.class )
-public class TierImp implements Tier, Serializable {
-
-    private static final long serialVersionUID = 0x920E4CDB395343AEL;
+public class TierImp implements Tier {
 
     protected InternationalPrice fixedPrice;
     protected Limit[] limits;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierPriceOverrideImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierPriceOverrideImp.java
index cc8c6f54..5353c9c7 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierPriceOverrideImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TierPriceOverrideImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.TieredBlockPriceOverride;
 
 @JsonDeserialize( builder = TierPriceOverrideImp.Builder.class )
-public class TierPriceOverrideImp implements TierPriceOverride, Serializable {
-
-    private static final long serialVersionUID = 0x500AF08EB554052AL;
+public class TierPriceOverrideImp implements TierPriceOverride {
 
     protected List<TieredBlockPriceOverride> tieredBlockPriceOverrides;
 
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockImp.java
index f99b8f17..75af6a5b 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BlockType;
@@ -29,9 +29,7 @@
 import org.killbill.billing.catalog.api.Unit;
 
 @JsonDeserialize( builder = TieredBlockImp.Builder.class )
-public class TieredBlockImp implements TieredBlock, Serializable {
-
-    private static final long serialVersionUID = 0xD94B1A0BE079B80L;
+public class TieredBlockImp implements TieredBlock {
 
     protected Double max;
     protected Double minTopUpCredit;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockPriceOverrideImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockPriceOverrideImp.java
index 05d01677..843477ce 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockPriceOverrideImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/TieredBlockPriceOverrideImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -27,9 +27,7 @@
 import org.killbill.billing.catalog.api.TieredBlockPriceOverride;
 
 @JsonDeserialize( builder = TieredBlockPriceOverrideImp.Builder.class )
-public class TieredBlockPriceOverrideImp implements TieredBlockPriceOverride, Serializable {
-
-    private static final long serialVersionUID = 0x98BDDDE54E98099EL;
+public class TieredBlockPriceOverrideImp implements TieredBlockPriceOverride {
 
     protected Currency currency;
     protected Double max;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UnitImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UnitImp.java
index ff563d0d..1832b5db 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UnitImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UnitImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Unit;
 
 @JsonDeserialize( builder = UnitImp.Builder.class )
-public class UnitImp implements Unit, Serializable {
-
-    private static final long serialVersionUID = 0xA4C176CA323A34E3L;
+public class UnitImp implements Unit {
 
     protected String name;
     protected String prettyName;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsageImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsageImp.java
index 618d47a2..28ea7b82 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsageImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsageImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingMode;
@@ -34,9 +34,7 @@
 import org.killbill.billing.catalog.api.UsageType;
 
 @JsonDeserialize( builder = UsageImp.Builder.class )
-public class UsageImp implements Usage, Serializable {
-
-    private static final long serialVersionUID = 0x11BB994DEC17BA4FL;
+public class UsageImp implements Usage {
 
     protected BillingMode billingMode;
     protected BillingPeriod billingPeriod;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsagePriceOverrideImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsagePriceOverrideImp.java
index 1f7b13f9..97d62bb2 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsagePriceOverrideImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/UsagePriceOverrideImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.catalog.api.UsageType;
 
 @JsonDeserialize( builder = UsagePriceOverrideImp.Builder.class )
-public class UsagePriceOverrideImp implements UsagePriceOverride, Serializable {
-
-    private static final long serialVersionUID = 0x8569E26A79BC90A8L;
+public class UsagePriceOverrideImp implements UsagePriceOverride {
 
     protected String name;
     protected List<TierPriceOverride> tierPriceOverrides;
diff --git a/src/main/java/org/killbill/billing/catalog/api/boilerplate/VersionedCatalogImp.java b/src/main/java/org/killbill/billing/catalog/api/boilerplate/VersionedCatalogImp.java
index e39d8323..eaff6795 100644
--- a/src/main/java/org/killbill/billing/catalog/api/boilerplate/VersionedCatalogImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/boilerplate/VersionedCatalogImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -28,9 +28,7 @@
 import org.killbill.billing.catalog.api.VersionedCatalog;
 
 @JsonDeserialize( builder = VersionedCatalogImp.Builder.class )
-public class VersionedCatalogImp implements VersionedCatalog, Serializable {
-
-    private static final long serialVersionUID = 0x8BE07D85C907BBD7L;
+public class VersionedCatalogImp implements VersionedCatalog {
 
     protected String catalogName;
     protected StaticCatalog currentVersion;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseBillingAlignmentImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseBillingAlignmentImp.java
index f88bf516..c2b3a6a1 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseBillingAlignmentImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseBillingAlignmentImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingAlignment;
@@ -32,9 +32,7 @@
 import org.killbill.billing.catalog.api.rules.CaseBillingAlignment;
 
 @JsonDeserialize( builder = CaseBillingAlignmentImp.Builder.class )
-public class CaseBillingAlignmentImp implements CaseBillingAlignment, Serializable {
-
-    private static final long serialVersionUID = 0xD6A4C0E45541455L;
+public class CaseBillingAlignmentImp implements CaseBillingAlignment {
 
     protected BillingAlignment billingAlignment;
     protected BillingPeriod billingPeriod;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCancelPolicyImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCancelPolicyImp.java
index 5859961d..73df0e5b 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCancelPolicyImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCancelPolicyImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingActionPolicy;
@@ -32,9 +32,7 @@
 import org.killbill.billing.catalog.api.rules.CaseCancelPolicy;
 
 @JsonDeserialize( builder = CaseCancelPolicyImp.Builder.class )
-public class CaseCancelPolicyImp implements CaseCancelPolicy, Serializable {
-
-    private static final long serialVersionUID = 0xE1E7268A5F18FDA4L;
+public class CaseCancelPolicyImp implements CaseCancelPolicy {
 
     protected BillingActionPolicy billingActionPolicy;
     protected BillingPeriod billingPeriod;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangeImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangeImp.java
index 0fadad4e..1e0a0f43 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangeImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangeImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -31,9 +31,7 @@
 import org.killbill.billing.catalog.api.rules.CaseChange;
 
 @JsonDeserialize( builder = CaseChangeImp.Builder.class )
-public class CaseChangeImp implements CaseChange, Serializable {
-
-    private static final long serialVersionUID = 0x2C17027C3FF1BA76L;
+public class CaseChangeImp implements CaseChange {
 
     protected StaticCatalog catalog;
     protected BillingPeriod fromBillingPeriod;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanAlignmentImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanAlignmentImp.java
index 54a47cc8..1239c70c 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanAlignmentImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanAlignmentImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -32,9 +32,7 @@
 import org.killbill.billing.catalog.api.rules.CaseChangePlanAlignment;
 
 @JsonDeserialize( builder = CaseChangePlanAlignmentImp.Builder.class )
-public class CaseChangePlanAlignmentImp implements CaseChangePlanAlignment, Serializable {
-
-    private static final long serialVersionUID = 0x38AC3D2990AAF96BL;
+public class CaseChangePlanAlignmentImp implements CaseChangePlanAlignment {
 
     protected PlanAlignmentChange alignment;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanPolicyImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanPolicyImp.java
index 57a068f3..f2dacaa1 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanPolicyImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseChangePlanPolicyImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingActionPolicy;
@@ -32,9 +32,7 @@
 import org.killbill.billing.catalog.api.rules.CaseChangePlanPolicy;
 
 @JsonDeserialize( builder = CaseChangePlanPolicyImp.Builder.class )
-public class CaseChangePlanPolicyImp implements CaseChangePlanPolicy, Serializable {
-
-    private static final long serialVersionUID = 0xA77F2F23913B6A4L;
+public class CaseChangePlanPolicyImp implements CaseChangePlanPolicy {
 
     protected BillingActionPolicy billingActionPolicy;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCreateAlignmentImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCreateAlignmentImp.java
index 7e4be53d..ba84b99e 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCreateAlignmentImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseCreateAlignmentImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -31,9 +31,7 @@
 import org.killbill.billing.catalog.api.rules.CaseCreateAlignment;
 
 @JsonDeserialize( builder = CaseCreateAlignmentImp.Builder.class )
-public class CaseCreateAlignmentImp implements CaseCreateAlignment, Serializable {
-
-    private static final long serialVersionUID = 0xADD02147DA69A7CCL;
+public class CaseCreateAlignmentImp implements CaseCreateAlignment {
 
     protected BillingPeriod billingPeriod;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseImp.java
index 08318676..a0b601a0 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CaseImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.rules.Case;
 
 @JsonDeserialize( builder = CaseImp.Builder.class )
-public class CaseImp implements Case, Serializable {
-
-    private static final long serialVersionUID = 0x64C7AD305395C264L;
+public class CaseImp implements Case {
 
     protected BillingPeriod billingPeriod;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePhaseImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePhaseImp.java
index 959d13de..b6bf20e6 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePhaseImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePhaseImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -31,9 +31,7 @@
 import org.killbill.billing.catalog.api.rules.CasePhase;
 
 @JsonDeserialize( builder = CasePhaseImp.Builder.class )
-public class CasePhaseImp implements CasePhase, Serializable {
-
-    private static final long serialVersionUID = 0xF4576A9E7E96405BL;
+public class CasePhaseImp implements CasePhase {
 
     protected BillingPeriod billingPeriod;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePriceListImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePriceListImp.java
index 9cccca99..1c429cb4 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePriceListImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/CasePriceListImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingPeriod;
@@ -30,9 +30,7 @@
 import org.killbill.billing.catalog.api.rules.CasePriceList;
 
 @JsonDeserialize( builder = CasePriceListImp.Builder.class )
-public class CasePriceListImp implements CasePriceList, Serializable {
-
-    private static final long serialVersionUID = 0x38E049510E90B5DEL;
+public class CasePriceListImp implements CasePriceList {
 
     protected BillingPeriod billingPeriod;
     protected StaticCatalog catalog;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Module.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Module.java
index a4962f51..b6bbfa45 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/PlanRulesImp.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/PlanRulesImp.java
index cc7398c9..292cd73c 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/PlanRulesImp.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/PlanRulesImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.BillingActionPolicy;
@@ -39,9 +39,7 @@
 import org.killbill.billing.catalog.api.rules.PlanRules;
 
 @JsonDeserialize( builder = PlanRulesImp.Builder.class )
-public class PlanRulesImp implements PlanRules, Serializable {
-
-    private static final long serialVersionUID = 0x56422BAD281B1B82L;
+public class PlanRulesImp implements PlanRules {
 
     protected Iterable<CaseBillingAlignment> caseBillingAlignment;
     protected Iterable<CaseCancelPolicy> caseCancelPolicy;
diff --git a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Resolver.java
index 41d28f0a..563a0dad 100644
--- a/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/catalog/api/rules/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.catalog.api.rules.boilerplate;
diff --git a/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionApiImp.java b/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionApiImp.java
index 5278249c..750ae5fe 100644
--- a/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionApiImp.java
+++ b/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.currency.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Set;
@@ -30,9 +30,7 @@
 import org.killbill.billing.currency.api.CurrencyConversionException;
 
 @JsonDeserialize( builder = CurrencyConversionApiImp.Builder.class )
-public class CurrencyConversionApiImp implements CurrencyConversionApi, Serializable {
-
-    private static final long serialVersionUID = 0xC831A56BB2A16681L;
+public class CurrencyConversionApiImp implements CurrencyConversionApi {
 
     protected Set<Currency> baseRates;
 
diff --git a/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionImp.java b/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionImp.java
index 9df70ee0..90597139 100644
--- a/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionImp.java
+++ b/src/main/java/org/killbill/billing/currency/api/boilerplate/CurrencyConversionImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.currency.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Set;
@@ -28,9 +28,7 @@
 import org.killbill.billing.currency.api.Rate;
 
 @JsonDeserialize( builder = CurrencyConversionImp.Builder.class )
-public class CurrencyConversionImp implements CurrencyConversion, Serializable {
-
-    private static final long serialVersionUID = 0x3137D29113B8AFC2L;
+public class CurrencyConversionImp implements CurrencyConversion {
 
     protected Currency baseCurrency;
     protected Set<Rate> rates;
diff --git a/src/main/java/org/killbill/billing/currency/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/currency/api/boilerplate/Module.java
index 0ffbbb60..1db59160 100644
--- a/src/main/java/org/killbill/billing/currency/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/currency/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.currency.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/currency/api/boilerplate/RateImp.java b/src/main/java/org/killbill/billing/currency/api/boilerplate/RateImp.java
index 9a988470..e411c555 100644
--- a/src/main/java/org/killbill/billing/currency/api/boilerplate/RateImp.java
+++ b/src/main/java/org/killbill/billing/currency/api/boilerplate/RateImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.currency.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.currency.api.Rate;
 
 @JsonDeserialize( builder = RateImp.Builder.class )
-public class RateImp implements Rate, Serializable {
-
-    private static final long serialVersionUID = 0xCA692346157DBC69L;
+public class RateImp implements Rate {
 
     protected Currency baseCurrency;
     protected DateTime conversionDate;
diff --git a/src/main/java/org/killbill/billing/currency/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/currency/api/boilerplate/Resolver.java
index bcebe876..6f1c18c8 100644
--- a/src/main/java/org/killbill/billing/currency/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/currency/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.currency.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BaseEntitlementWithAddOnsSpecifierImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BaseEntitlementWithAddOnsSpecifierImp.java
index e6d76429..76cb2ff8 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BaseEntitlementWithAddOnsSpecifierImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BaseEntitlementWithAddOnsSpecifierImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.entitlement.api.EntitlementSpecifier;
 
 @JsonDeserialize( builder = BaseEntitlementWithAddOnsSpecifierImp.Builder.class )
-public class BaseEntitlementWithAddOnsSpecifierImp implements BaseEntitlementWithAddOnsSpecifier, Serializable {
-
-    private static final long serialVersionUID = 0x8ACE98B2CF2F0A9EL;
+public class BaseEntitlementWithAddOnsSpecifierImp implements BaseEntitlementWithAddOnsSpecifier {
 
     protected LocalDate billingEffectiveDate;
     protected String bundleExternalKey;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockableImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockableImp.java
index f355fb77..4ecee498 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockableImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockableImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.entitlement.api.Blockable;
 
 @JsonDeserialize( builder = BlockableImp.Builder.class )
-public class BlockableImp implements Blockable, Serializable {
-
-    private static final long serialVersionUID = 0x82D5CD205D905748L;
+public class BlockableImp implements Blockable {
 
     protected DateTime createdDate;
     protected UUID id;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockingStateImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockingStateImp.java
index b7f63418..3194e9d4 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockingStateImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/BlockingStateImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.entitlement.api.BlockingStateType;
 
 @JsonDeserialize( builder = BlockingStateImp.Builder.class )
-public class BlockingStateImp implements BlockingState, Serializable {
-
-    private static final long serialVersionUID = 0x31C0C2B0A0CB238AL;
+public class BlockingStateImp implements BlockingState {
 
     protected UUID blockedId;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementAOStatusDryRunImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementAOStatusDryRunImp.java
index d81255d1..0d42c86f 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementAOStatusDryRunImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementAOStatusDryRunImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.entitlement.api.EntitlementAOStatusDryRun;
 
 @JsonDeserialize( builder = EntitlementAOStatusDryRunImp.Builder.class )
-public class EntitlementAOStatusDryRunImp implements EntitlementAOStatusDryRun, Serializable {
-
-    private static final long serialVersionUID = 0xFA53649A6CD7E597L;
+public class EntitlementAOStatusDryRunImp implements EntitlementAOStatusDryRun {
 
     protected BillingPeriod billingPeriod;
     protected UUID id;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementApiImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementApiImp.java
index 40861856..26a97429 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementApiImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -37,9 +37,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = EntitlementApiImp.Builder.class )
-public class EntitlementApiImp implements EntitlementApi, Serializable {
-
-    private static final long serialVersionUID = 0x377EE5F1D9AD91C2L;
+public class EntitlementApiImp implements EntitlementApi {
 
 
     public EntitlementApiImp(final EntitlementApiImp that) {
@@ -76,22 +74,22 @@ public UUID transferEntitlements(final UUID sourceAccountId, final UUID destAcco
         throw new UnsupportedOperationException("transferEntitlements(java.util.UUID, java.util.UUID, java.lang.String, org.joda.time.LocalDate, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public UUID transferEntitlementsOverrideBillingPolicy(final UUID sourceAccountId, final UUID destAccountId, final String bundleExternalKey, final LocalDate effectiveDate, final BillingActionPolicy billingPolicy, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("transferEntitlementsOverrideBillingPolicy(java.util.UUID, java.util.UUID, java.lang.String, org.joda.time.LocalDate, org.killbill.billing.catalog.api.BillingActionPolicy, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public List<Entitlement> getAllEntitlementsForAccountIdAndBundleExternalKey(final UUID accountId, final String bundleExternalKey, final TenantContext context) {
         throw new UnsupportedOperationException("getAllEntitlementsForAccountIdAndBundleExternalKey(java.util.UUID, java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public UUID createBaseEntitlement(final UUID accountId, final EntitlementSpecifier spec, final String bundleExternalKey, final LocalDate entitlementEffectiveDate, final LocalDate billingEffectiveDate, final boolean isMigrated, final boolean renameCancelledBundleIfExist, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("createBaseEntitlement(java.util.UUID, org.killbill.billing.entitlement.api.EntitlementSpecifier, java.lang.String, org.joda.time.LocalDate, org.joda.time.LocalDate, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    public UUID transferEntitlementsOverrideBillingPolicy(final UUID sourceAccountId, final UUID destAccountId, final String bundleExternalKey, final LocalDate effectiveDate, final BillingActionPolicy billingPolicy, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("transferEntitlementsOverrideBillingPolicy(java.util.UUID, java.util.UUID, java.lang.String, org.joda.time.LocalDate, org.killbill.billing.catalog.api.BillingActionPolicy, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
     public UUID addEntitlement(final UUID bundleId, final EntitlementSpecifier spec, final LocalDate entitlementEffectiveDate, final LocalDate billingEffectiveDate, final boolean isMigrated, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("addEntitlement(java.util.UUID, org.killbill.billing.entitlement.api.EntitlementSpecifier, org.joda.time.LocalDate, org.joda.time.LocalDate, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public UUID createBaseEntitlement(final UUID accountId, final EntitlementSpecifier spec, final String bundleExternalKey, final LocalDate entitlementEffectiveDate, final LocalDate billingEffectiveDate, final boolean isMigrated, final boolean renameCancelledBundleIfExist, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("createBaseEntitlement(java.util.UUID, org.killbill.billing.entitlement.api.EntitlementSpecifier, java.lang.String, org.joda.time.LocalDate, org.joda.time.LocalDate, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public List<UUID> createBaseEntitlementsWithAddOns(final UUID accountId, final Iterable<BaseEntitlementWithAddOnsSpecifier> baseEntitlementWithAddOnsSpecifier, final boolean renameCancelledBundleIfExist, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("createBaseEntitlementsWithAddOns(java.util.UUID, java.lang.Iterable<org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier>, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -103,7 +101,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final EntitlementApiImp that = (EntitlementApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementImp.java
index 8c1a603f..f86aa04e 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -38,9 +38,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = EntitlementImp.Builder.class )
-public class EntitlementImp implements Entitlement, Serializable {
-
-    private static final long serialVersionUID = 0xA45D9D5CD7043073L;
+public class EntitlementImp implements Entitlement {
 
     protected UUID accountId;
     protected UUID baseEntitlementId;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementSpecifierImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementSpecifierImp.java
index 5a45c315..43e5e20c 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementSpecifierImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/EntitlementSpecifierImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.entitlement.api.EntitlementSpecifier;
 
 @JsonDeserialize( builder = EntitlementSpecifierImp.Builder.class )
-public class EntitlementSpecifierImp implements EntitlementSpecifier, Serializable {
-
-    private static final long serialVersionUID = 0x2216884C686BC006L;
+public class EntitlementSpecifierImp implements EntitlementSpecifier {
 
     protected Integer billCycleDay;
     protected String externalKey;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Module.java
index 70ce6e23..e7e62c76 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Resolver.java
index 3ba1fa66..32cd69d8 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionApiImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionApiImp.java
index 7f728006..457bccdf 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionApiImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -41,9 +41,7 @@
 import org.killbill.billing.util.entity.Pagination;
 
 @JsonDeserialize( builder = SubscriptionApiImp.Builder.class )
-public class SubscriptionApiImp implements SubscriptionApi, Serializable {
-
-    private static final long serialVersionUID = 0xE8DBB39D0E927238L;
+public class SubscriptionApiImp implements SubscriptionApi {
 
 
     public SubscriptionApiImp(final SubscriptionApiImp that) {
@@ -88,26 +86,26 @@ public List<AuditLogWithHistory> getBlockingStateAuditLogsWithHistoryForId(final
         throw new UnsupportedOperationException("getBlockingStateAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<SubscriptionBundle> getSubscriptionBundlesForAccountId(final UUID accountId, final TenantContext context) {
-        throw new UnsupportedOperationException("getSubscriptionBundlesForAccountId(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public void addBlockingState(final BlockingState blockingState, final LocalDate effectiveDate, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("addBlockingState(org.killbill.billing.entitlement.api.BlockingState, org.joda.time.LocalDate, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public List<AuditLogWithHistory> getSubscriptionAuditLogsWithHistoryForId(final UUID entitlementId, final AuditLevel auditLevel, final TenantContext context) {
-        throw new UnsupportedOperationException("getSubscriptionAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    public List<SubscriptionBundle> getSubscriptionBundlesForAccountId(final UUID accountId, final TenantContext context) {
+        throw new UnsupportedOperationException("getSubscriptionBundlesForAccountId(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<SubscriptionBundle> getSubscriptionBundlesForAccountIdAndExternalKey(final UUID accountId, final String externalKey, final TenantContext context) {
-        throw new UnsupportedOperationException("getSubscriptionBundlesForAccountIdAndExternalKey(java.util.UUID, java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    public List<AuditLogWithHistory> getSubscriptionAuditLogsWithHistoryForId(final UUID entitlementId, final AuditLevel auditLevel, final TenantContext context) {
+        throw new UnsupportedOperationException("getSubscriptionAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
     public Pagination<SubscriptionBundle> getSubscriptionBundles(final Long offset, final Long limit, final TenantContext context) {
         throw new UnsupportedOperationException("getSubscriptionBundles(java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public List<SubscriptionBundle> getSubscriptionBundlesForAccountIdAndExternalKey(final UUID accountId, final String externalKey, final TenantContext context) {
+        throw new UnsupportedOperationException("getSubscriptionBundlesForAccountIdAndExternalKey(java.util.UUID, java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public List<AuditLogWithHistory> getSubscriptionBundleAuditLogsWithHistoryForId(final UUID bundleId, final AuditLevel auditLevel, final TenantContext context) {
         throw new UnsupportedOperationException("getSubscriptionBundleAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -123,7 +121,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final SubscriptionApiImp that = (SubscriptionApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleImp.java
index d5a8cd68..4192d649 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -30,9 +30,7 @@
 import org.killbill.billing.entitlement.api.SubscriptionBundleTimeline;
 
 @JsonDeserialize( builder = SubscriptionBundleImp.Builder.class )
-public class SubscriptionBundleImp implements SubscriptionBundle, Serializable {
-
-    private static final long serialVersionUID = 0x31F82D72491256B4L;
+public class SubscriptionBundleImp implements SubscriptionBundle {
 
     protected UUID accountId;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleTimelineImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleTimelineImp.java
index 043e03e2..e27d84e6 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleTimelineImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionBundleTimelineImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.entitlement.api.SubscriptionEvent;
 
 @JsonDeserialize( builder = SubscriptionBundleTimelineImp.Builder.class )
-public class SubscriptionBundleTimelineImp implements SubscriptionBundleTimeline, Serializable {
-
-    private static final long serialVersionUID = 0x318C9EEE4713FDCAL;
+public class SubscriptionBundleTimelineImp implements SubscriptionBundleTimeline {
 
     protected UUID accountId;
     protected UUID bundleId;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionEventImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionEventImp.java
index 0071d71a..dd5b87d2 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionEventImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionEventImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -33,9 +33,7 @@
 import org.killbill.billing.entitlement.api.SubscriptionEventType;
 
 @JsonDeserialize( builder = SubscriptionEventImp.Builder.class )
-public class SubscriptionEventImp implements SubscriptionEvent, Serializable {
-
-    private static final long serialVersionUID = 0x8275A9C29D208B9AL;
+public class SubscriptionEventImp implements SubscriptionEvent {
 
     protected LocalDate effectiveDate;
     protected UUID entitlementId;
diff --git a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionImp.java b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionImp.java
index a59dda23..e5139f2c 100644
--- a/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionImp.java
+++ b/src/main/java/org/killbill/billing/entitlement/api/boilerplate/SubscriptionImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.entitlement.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -41,9 +41,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = SubscriptionImp.Builder.class )
-public class SubscriptionImp implements Subscription, Serializable {
-
-    private static final long serialVersionUID = 0xED7E9E60C49D765L;
+public class SubscriptionImp implements Subscription {
 
     protected UUID accountId;
     protected UUID baseEntitlementId;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/DryRunArgumentsImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/DryRunArgumentsImp.java
index d9ee17ba..8545deac 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/DryRunArgumentsImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/DryRunArgumentsImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -31,9 +31,7 @@
 import org.killbill.billing.invoice.api.DryRunType;
 
 @JsonDeserialize( builder = DryRunArgumentsImp.Builder.class )
-public class DryRunArgumentsImp implements DryRunArguments, Serializable {
-
-    private static final long serialVersionUID = 0xC0A75EB539775834L;
+public class DryRunArgumentsImp implements DryRunArguments {
 
     protected SubscriptionEventType action;
     protected BillingActionPolicy billingActionPolicy;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceCreationEventImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceCreationEventImp.java
index 1683703f..28861072 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceCreationEventImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceCreationEventImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.invoice.api.InvoiceCreationEvent;
 
 @JsonDeserialize( builder = InvoiceCreationEventImp.Builder.class )
-public class InvoiceCreationEventImp implements InvoiceCreationEvent, Serializable {
-
-    private static final long serialVersionUID = 0x16BB71F278A6B022L;
+public class InvoiceCreationEventImp implements InvoiceCreationEvent {
 
 
     public InvoiceCreationEventImp(final InvoiceCreationEventImp that) {
@@ -43,7 +41,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final InvoiceCreationEventImp that = (InvoiceCreationEventImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceImp.java
index 250a9bc9..8f319760 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
@@ -35,9 +35,7 @@
 import org.killbill.billing.invoice.api.InvoiceStatus;
 
 @JsonDeserialize( builder = InvoiceImp.Builder.class )
-public class InvoiceImp implements Invoice, Serializable {
-
-    private static final long serialVersionUID = 0x1911E930E2A49165L;
+public class InvoiceImp implements Invoice {
 
     protected UUID accountId;
     protected BigDecimal balance;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceItemImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceItemImp.java
index f1953da9..b36a8e1b 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceItemImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceItemImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -31,9 +31,7 @@
 import org.killbill.billing.invoice.api.InvoiceItemType;
 
 @JsonDeserialize( builder = InvoiceItemImp.Builder.class )
-public class InvoiceItemImp implements InvoiceItem, Serializable {
-
-    private static final long serialVersionUID = 0xEAED5A85CF301F11L;
+public class InvoiceItemImp implements InvoiceItem {
 
     protected UUID accountId;
     protected BigDecimal amount;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceParentChildImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceParentChildImp.java
index 71f5d612..bf288582 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceParentChildImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceParentChildImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.invoice.api.InvoiceParentChild;
 
 @JsonDeserialize( builder = InvoiceParentChildImp.Builder.class )
-public class InvoiceParentChildImp implements InvoiceParentChild, Serializable {
-
-    private static final long serialVersionUID = 0x84A09113887080CCL;
+public class InvoiceParentChildImp implements InvoiceParentChild {
 
     protected UUID childAccountId;
     protected UUID childInvoiceId;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoicePaymentImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoicePaymentImp.java
index f244df0e..74fa0861 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoicePaymentImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoicePaymentImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -30,9 +30,7 @@
 import org.killbill.billing.invoice.api.InvoicePaymentType;
 
 @JsonDeserialize( builder = InvoicePaymentImp.Builder.class )
-public class InvoicePaymentImp implements InvoicePayment, Serializable {
-
-    private static final long serialVersionUID = 0xC42E4426E09BB7ADL;
+public class InvoicePaymentImp implements InvoicePayment {
 
     protected BigDecimal amount;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceUserApiImp.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceUserApiImp.java
index b4ba1be5..7f031bc4 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceUserApiImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/InvoiceUserApiImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.IOException;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
@@ -44,9 +44,7 @@
 import org.killbill.billing.util.entity.Pagination;
 
 @JsonDeserialize( builder = InvoiceUserApiImp.Builder.class )
-public class InvoiceUserApiImp implements InvoiceUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x43B28676FD363526L;
+public class InvoiceUserApiImp implements InvoiceUserApi {
 
 
     public InvoiceUserApiImp(final InvoiceUserApiImp that) {
@@ -55,16 +53,12 @@ protected InvoiceUserApiImp(final InvoiceUserApiImp.Builder<?> builder) {
     }
     protected InvoiceUserApiImp() { }
     @Override
-    public void transferChildCreditToParent(final UUID childAccountId, final CallContext context) {
-        throw new UnsupportedOperationException("transferChildCreditToParent(java.util.UUID, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public List<InvoiceItem> insertExternalCharges(final UUID accountId, final LocalDate effectiveDate, final Iterable<InvoiceItem> charges, final boolean autoCommit, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("insertExternalCharges(java.util.UUID, org.joda.time.LocalDate, java.lang.Iterable<org.killbill.billing.invoice.api.InvoiceItem>, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public String getInvoiceAsHTML(final UUID invoiceId, final TenantContext context) {
-        throw new UnsupportedOperationException("getInvoiceAsHTML(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    public void transferChildCreditToParent(final UUID childAccountId, final CallContext context) {
+        throw new UnsupportedOperationException("transferChildCreditToParent(java.util.UUID, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
     public Pagination<Invoice> searchInvoices(final String searchKey, final Long offset, final Long limit, final TenantContext context) {
@@ -75,6 +69,10 @@ public Invoice getInvoiceByPayment(final UUID paymentId, final TenantContext con
         throw new UnsupportedOperationException("getInvoiceByPayment(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public String getInvoiceAsHTML(final UUID invoiceId, final TenantContext context) {
+        throw new UnsupportedOperationException("getInvoiceAsHTML(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public List<Invoice> getInvoicesByAccount(final UUID accountId, final boolean includesMigrated, final boolean includeVoidedInvoices, final TenantContext context) {
         throw new UnsupportedOperationException("getInvoicesByAccount(java.util.UUID, boolean, boolean, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -131,14 +129,14 @@ public Pagination<Invoice> getInvoices(final Long offset, final Long limit, fina
         throw new UnsupportedOperationException("getInvoices(java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<InvoiceItem> insertCredits(final UUID accountId, final LocalDate effectiveDate, final Iterable<InvoiceItem> creditItems, final boolean autoCommit, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("insertCredits(java.util.UUID, org.joda.time.LocalDate, java.lang.Iterable<org.killbill.billing.invoice.api.InvoiceItem>, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public InvoiceItem getCreditById(final UUID creditId, final TenantContext context) {
         throw new UnsupportedOperationException("getCreditById(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public List<InvoiceItem> insertCredits(final UUID accountId, final LocalDate effectiveDate, final Iterable<InvoiceItem> creditItems, final boolean autoCommit, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("insertCredits(java.util.UUID, org.joda.time.LocalDate, java.lang.Iterable<org.killbill.billing.invoice.api.InvoiceItem>, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public InvoiceItem insertInvoiceItemAdjustment(final UUID accountId, final UUID invoiceId, final UUID invoiceItemId, final LocalDate effectiveDate, final String description, final String itemDetails, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("insertInvoiceItemAdjustment(java.util.UUID, java.util.UUID, java.util.UUID, org.joda.time.LocalDate, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -194,7 +192,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final InvoiceUserApiImp that = (InvoiceUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/Module.java
index 9d7fda28..efe6a0f3 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/invoice/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/invoice/api/boilerplate/Resolver.java
index a8bb8e63..8ab1eed2 100644
--- a/src/main/java/org/killbill/billing/invoice/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/invoice/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceFormatterImp.java b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceFormatterImp.java
index 07b91ebb..d5d9198f 100644
--- a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceFormatterImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceFormatterImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.formatters.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
@@ -35,9 +35,7 @@
 import org.killbill.billing.invoice.api.formatters.InvoiceFormatter;
 
 @JsonDeserialize( builder = InvoiceFormatterImp.Builder.class )
-public class InvoiceFormatterImp implements InvoiceFormatter, Serializable {
-
-    private static final long serialVersionUID = 0x1AE703146018525BL;
+public class InvoiceFormatterImp implements InvoiceFormatter {
 
     protected UUID accountId;
     protected BigDecimal balance;
diff --git a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceItemFormatterImp.java b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceItemFormatterImp.java
index ea2f1f7d..895a5acf 100644
--- a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceItemFormatterImp.java
+++ b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/InvoiceItemFormatterImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.formatters.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -31,9 +31,7 @@
 import org.killbill.billing.invoice.api.formatters.InvoiceItemFormatter;
 
 @JsonDeserialize( builder = InvoiceItemFormatterImp.Builder.class )
-public class InvoiceItemFormatterImp implements InvoiceItemFormatter, Serializable {
-
-    private static final long serialVersionUID = 0x27111BE21BB71CDCL;
+public class InvoiceItemFormatterImp implements InvoiceItemFormatter {
 
     protected UUID accountId;
     protected BigDecimal amount;
diff --git a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Module.java b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Module.java
index 75f63839..2cd8f5c4 100644
--- a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.formatters.boilerplate;
diff --git a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Resolver.java
index 096adcfe..7370b2b7 100644
--- a/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/invoice/api/formatters/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.invoice.api.formatters.boilerplate;
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/HealthcheckImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/HealthcheckImp.java
index c15e2324..ded36f0d 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/HealthcheckImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/HealthcheckImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
@@ -27,9 +27,7 @@
 import org.killbill.billing.tenant.api.Tenant;
 
 @JsonDeserialize( builder = HealthcheckImp.Builder.class )
-public class HealthcheckImp implements Healthcheck, Serializable {
-
-    private static final long serialVersionUID = 0xE655C4248CAE949FL;
+public class HealthcheckImp implements Healthcheck {
 
 
     public HealthcheckImp(final HealthcheckImp that) {
@@ -49,7 +47,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final HealthcheckImp that = (HealthcheckImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/Module.java
index 526396ab..1b06646d 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIKillbillImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIKillbillImp.java
index 9d6fac69..692b61ff 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIKillbillImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIKillbillImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.account.api.AccountUserApi;
@@ -46,9 +46,7 @@
 import org.killbill.billing.util.nodes.KillbillNodesApi;
 
 @JsonDeserialize( builder = OSGIKillbillImp.Builder.class )
-public class OSGIKillbillImp implements OSGIKillbill, Serializable {
-
-    private static final long serialVersionUID = 0x95EB15ABC31DA206L;
+public class OSGIKillbillImp implements OSGIKillbill {
 
     protected AccountUserApi accountUserApi;
     protected AdminPaymentApi adminPaymentApi;
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIPluginPropertiesImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIPluginPropertiesImp.java
index 36ba6551..dc34a035 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIPluginPropertiesImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/OSGIPluginPropertiesImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
 
 @JsonDeserialize( builder = OSGIPluginPropertiesImp.Builder.class )
-public class OSGIPluginPropertiesImp implements OSGIPluginProperties, Serializable {
-
-    private static final long serialVersionUID = 0xBA59CD1E61252620L;
+public class OSGIPluginPropertiesImp implements OSGIPluginProperties {
 
 
     public OSGIPluginPropertiesImp(final OSGIPluginPropertiesImp that) {
@@ -43,7 +41,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final OSGIPluginPropertiesImp that = (OSGIPluginPropertiesImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginInfoImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginInfoImp.java
index cf604c71..95083373 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginInfoImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginInfoImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Set;
@@ -28,9 +28,7 @@
 import org.killbill.billing.osgi.api.PluginState;
 
 @JsonDeserialize( builder = PluginInfoImp.Builder.class )
-public class PluginInfoImp implements PluginInfo, Serializable {
-
-    private static final long serialVersionUID = 0xB9029905DFA97950L;
+public class PluginInfoImp implements PluginInfo {
 
     protected String bundleSymbolicName;
     protected boolean isSelectedForStart;
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginServiceInfoImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginServiceInfoImp.java
index af838669..b6c7205c 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginServiceInfoImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginServiceInfoImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.PluginServiceInfo;
 
 @JsonDeserialize( builder = PluginServiceInfoImp.Builder.class )
-public class PluginServiceInfoImp implements PluginServiceInfo, Serializable {
-
-    private static final long serialVersionUID = 0x673FA98461167B1FL;
+public class PluginServiceInfoImp implements PluginServiceInfo {
 
     protected String registrationName;
     protected String serviceTypeName;
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginsInfoApiImp.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginsInfoApiImp.java
index 5a39e600..56f3e883 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginsInfoApiImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/PluginsInfoApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.PluginInfo;
@@ -28,9 +28,7 @@
 import org.killbill.billing.osgi.api.config.PluginLanguage;
 
 @JsonDeserialize( builder = PluginsInfoApiImp.Builder.class )
-public class PluginsInfoApiImp implements PluginsInfoApi, Serializable {
-
-    private static final long serialVersionUID = 0xFF04D697E6CBEADEL;
+public class PluginsInfoApiImp implements PluginsInfoApi {
 
     protected Iterable<PluginInfo> pluginsInfo;
 
diff --git a/src/main/java/org/killbill/billing/osgi/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/osgi/api/boilerplate/Resolver.java
index 55394bbd..4c1316fe 100644
--- a/src/main/java/org/killbill/billing/osgi/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/osgi/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Module.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Module.java
index bc139014..5eee94bc 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigImp.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigImp.java
index 8022016d..abe6bfdd 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.File;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.config.PluginConfig;
@@ -28,9 +28,7 @@
 import org.killbill.billing.osgi.api.config.PluginType;
 
 @JsonDeserialize( builder = PluginConfigImp.Builder.class )
-public class PluginConfigImp implements PluginConfig, Serializable {
-
-    private static final long serialVersionUID = 0x3C97070067D45587L;
+public class PluginConfigImp implements PluginConfig {
 
     protected boolean isDisabled;
     protected boolean isSelectedForStart;
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigServiceApiImp.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigServiceApiImp.java
index 28c60a24..159708e2 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigServiceApiImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginConfigServiceApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.config.PluginConfigServiceApi;
@@ -27,9 +27,7 @@
 import org.killbill.billing.osgi.api.config.PluginRubyConfig;
 
 @JsonDeserialize( builder = PluginConfigServiceApiImp.Builder.class )
-public class PluginConfigServiceApiImp implements PluginConfigServiceApi, Serializable {
-
-    private static final long serialVersionUID = 0x7FA95CF314C588A6L;
+public class PluginConfigServiceApiImp implements PluginConfigServiceApi {
 
 
     public PluginConfigServiceApiImp(final PluginConfigServiceApiImp that) {
@@ -38,14 +36,14 @@ protected PluginConfigServiceApiImp(final PluginConfigServiceApiImp.Builder<?> b
     }
     protected PluginConfigServiceApiImp() { }
     @Override
-    public PluginJavaConfig getPluginJavaConfig(final long bundleId) {
-        throw new UnsupportedOperationException("getPluginJavaConfig(long) must be implemented.");
-    }
-    @Override
     public PluginRubyConfig getPluginRubyConfig(final long bundleId) {
         throw new UnsupportedOperationException("getPluginRubyConfig(long) must be implemented.");
     }
     @Override
+    public PluginJavaConfig getPluginJavaConfig(final long bundleId) {
+        throw new UnsupportedOperationException("getPluginJavaConfig(long) must be implemented.");
+    }
+    @Override
     public boolean equals(final Object o) {
         if ( this == o ) {
             return true;
@@ -53,7 +51,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final PluginConfigServiceApiImp that = (PluginConfigServiceApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginJavaConfigImp.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginJavaConfigImp.java
index 264b20fb..13708089 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginJavaConfigImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginJavaConfigImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.File;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.config.PluginConfig;
@@ -29,9 +29,7 @@
 import org.killbill.billing.osgi.api.config.PluginType;
 
 @JsonDeserialize( builder = PluginJavaConfigImp.Builder.class )
-public class PluginJavaConfigImp implements PluginJavaConfig, Serializable {
-
-    private static final long serialVersionUID = 0xBEB2603DF892B0A4L;
+public class PluginJavaConfigImp implements PluginJavaConfig {
 
     protected String bundleJarPath;
     protected boolean isDisabled;
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginRubyConfigImp.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginRubyConfigImp.java
index 33eebc21..e112c0c4 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginRubyConfigImp.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/PluginRubyConfigImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.File;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.config.PluginConfig;
@@ -29,9 +29,7 @@
 import org.killbill.billing.osgi.api.config.PluginType;
 
 @JsonDeserialize( builder = PluginRubyConfigImp.Builder.class )
-public class PluginRubyConfigImp implements PluginRubyConfig, Serializable {
-
-    private static final long serialVersionUID = 0x901C01B3EBBA102DL;
+public class PluginRubyConfigImp implements PluginRubyConfig {
 
     protected boolean isDisabled;
     protected boolean isSelectedForStart;
diff --git a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Resolver.java
index 0d412c66..f5e21811 100644
--- a/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/osgi/api/config/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.osgi.api.config.boilerplate;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/EmailNotificationImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/EmailNotificationImp.java
index 096309b5..69bc8b81 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/EmailNotificationImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/EmailNotificationImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.overdue.api.EmailNotification;
 
 @JsonDeserialize( builder = EmailNotificationImp.Builder.class )
-public class EmailNotificationImp implements EmailNotification, Serializable {
-
-    private static final long serialVersionUID = 0xE60FBB8D4C6B579FL;
+public class EmailNotificationImp implements EmailNotification {
 
     protected Boolean isHTML;
     protected String subject;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/Module.java
index 05becd7e..79eff1d5 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueApiImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueApiImp.java
index aec99afb..4ff6f781 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueApiImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -31,9 +31,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = OverdueApiImp.Builder.class )
-public class OverdueApiImp implements OverdueApi, Serializable {
-
-    private static final long serialVersionUID = 0xB51D1B98180BE0EBL;
+public class OverdueApiImp implements OverdueApi {
 
 
     public OverdueApiImp(final OverdueApiImp that) {
@@ -65,7 +63,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final OverdueApiImp that = (OverdueApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConditionImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConditionImp.java
index 5bca1177..37b1c4b6 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConditionImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConditionImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.tag.ControlTagType;
 
 @JsonDeserialize( builder = OverdueConditionImp.Builder.class )
-public class OverdueConditionImp implements OverdueCondition, Serializable {
-
-    private static final long serialVersionUID = 0x2AB7DE125D71E096L;
+public class OverdueConditionImp implements OverdueCondition {
 
     protected ControlTagType exclusionControlTagType;
     protected ControlTagType inclusionControlTagType;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConfigImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConfigImp.java
index 1393aa66..05f47ad8 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConfigImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueConfigImp.java
@@ -1,34 +1,32 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.overdue.api.OverdueConfig;
 import org.killbill.billing.overdue.api.OverdueStatesAccount;
 
 @JsonDeserialize( builder = OverdueConfigImp.Builder.class )
-public class OverdueConfigImp implements OverdueConfig, Serializable {
-
-    private static final long serialVersionUID = 0xFBDCFEF03EB6F0BEL;
+public class OverdueConfigImp implements OverdueConfig {
 
     protected OverdueStatesAccount overdueStatesAccount;
 
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStateImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStateImp.java
index f5982051..64a77267 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStateImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStateImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.catalog.api.Duration;
@@ -29,9 +29,7 @@
 import org.killbill.billing.overdue.api.OverdueState;
 
 @JsonDeserialize( builder = OverdueStateImp.Builder.class )
-public class OverdueStateImp implements OverdueState, Serializable {
-
-    private static final long serialVersionUID = 0x3CF6E8406781974EL;
+public class OverdueStateImp implements OverdueState {
 
     protected Duration autoReevaluationInterval;
     protected String externalMessage;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStatesAccountImp.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStatesAccountImp.java
index 7093121c..01368467 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStatesAccountImp.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/OverdueStatesAccountImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.joda.time.Period;
@@ -27,9 +27,7 @@
 import org.killbill.billing.overdue.api.OverdueStatesAccount;
 
 @JsonDeserialize( builder = OverdueStatesAccountImp.Builder.class )
-public class OverdueStatesAccountImp implements OverdueStatesAccount, Serializable {
-
-    private static final long serialVersionUID = 0x4828ABF3F348F92DL;
+public class OverdueStatesAccountImp implements OverdueStatesAccount {
 
     protected Period initialReevaluationInterval;
     protected OverdueState[] states;
diff --git a/src/main/java/org/killbill/billing/overdue/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/overdue/api/boilerplate/Resolver.java
index afcb3d42..63d3db76 100644
--- a/src/main/java/org/killbill/billing/overdue/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/overdue/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.overdue.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/AdminPaymentApiImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/AdminPaymentApiImp.java
index 26efb973..6d8d8245 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/AdminPaymentApiImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/AdminPaymentApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.payment.api.AdminPaymentApi;
@@ -31,9 +31,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = AdminPaymentApiImp.Builder.class )
-public class AdminPaymentApiImp implements AdminPaymentApi, Serializable {
-
-    private static final long serialVersionUID = 0xCF79686F682D667FL;
+public class AdminPaymentApiImp implements AdminPaymentApi {
 
 
     public AdminPaymentApiImp(final AdminPaymentApiImp that) {
@@ -53,7 +51,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final AdminPaymentApiImp that = (AdminPaymentApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/InvoicePaymentApiImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/InvoicePaymentApiImp.java
index 85ff42d1..cd9d25b6 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/InvoicePaymentApiImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/InvoicePaymentApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -38,9 +38,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = InvoicePaymentApiImp.Builder.class )
-public class InvoicePaymentApiImp implements InvoicePaymentApi, Serializable {
-
-    private static final long serialVersionUID = 0xB0A62AA1EE29BD1EL;
+public class InvoicePaymentApiImp implements InvoicePaymentApi {
 
 
     public InvoicePaymentApiImp(final InvoicePaymentApiImp that) {
@@ -49,14 +47,14 @@ protected InvoicePaymentApiImp(final InvoicePaymentApiImp.Builder<?> builder) {
     }
     protected InvoicePaymentApiImp() { }
     @Override
-    public InvoicePayment createPurchaseForInvoicePayment(final Account account, final UUID invoiceId, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
-        throw new UnsupportedOperationException("createPurchaseForInvoicePayment(org.killbill.billing.account.api.Account, java.util.UUID, java.util.UUID, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public InvoicePayment createCreditForInvoicePayment(final boolean isAdjusted, final Map<UUID, BigDecimal> adjustments, final Account account, final UUID originalPaymentId, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
         throw new UnsupportedOperationException("createCreditForInvoicePayment(boolean, java.util.Map<java.util.UUID, java.math.BigDecimal>, org.killbill.billing.account.api.Account, java.util.UUID, java.util.UUID, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public InvoicePayment createPurchaseForInvoicePayment(final Account account, final UUID invoiceId, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
+        throw new UnsupportedOperationException("createPurchaseForInvoicePayment(org.killbill.billing.account.api.Account, java.util.UUID, java.util.UUID, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public List<InvoicePayment> getInvoicePayments(final UUID paymentId, final TenantContext context) {
         throw new UnsupportedOperationException("getInvoicePayments(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -69,14 +67,14 @@ public InvoicePayment createChargebackReversalForInvoicePayment(final Account ac
         throw new UnsupportedOperationException("createChargebackReversalForInvoicePayment(org.killbill.billing.account.api.Account, java.util.UUID, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public List<InvoicePayment> getInvoicePaymentsByAccount(final UUID accountId, final TenantContext context) {
-        throw new UnsupportedOperationException("getInvoicePaymentsByAccount(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public InvoicePayment createRefundForInvoicePayment(final boolean isAdjusted, final Map<UUID, BigDecimal> adjustments, final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
         throw new UnsupportedOperationException("createRefundForInvoicePayment(boolean, java.util.Map<java.util.UUID, java.math.BigDecimal>, org.killbill.billing.account.api.Account, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public List<InvoicePayment> getInvoicePaymentsByAccount(final UUID accountId, final TenantContext context) {
+        throw new UnsupportedOperationException("getInvoicePaymentsByAccount(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public InvoicePayment createChargebackForInvoicePayment(final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
         throw new UnsupportedOperationException("createChargebackForInvoicePayment(org.killbill.billing.account.api.Account, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -88,7 +86,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final InvoicePaymentApiImp that = (InvoicePaymentApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/Module.java
index e255eb01..eb60550d 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentApiImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentApiImp.java
index c6814a41..5b18438c 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentApiImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -42,9 +42,7 @@
 import org.killbill.billing.util.entity.Pagination;
 
 @JsonDeserialize( builder = PaymentApiImp.Builder.class )
-public class PaymentApiImp implements PaymentApi, Serializable {
-
-    private static final long serialVersionUID = 0x6092A6E7DA13BCFDL;
+public class PaymentApiImp implements PaymentApi {
 
 
     public PaymentApiImp(final PaymentApiImp that) {
@@ -57,14 +55,14 @@ public Pagination<Payment> getPayments(final Long offset, final Long limit, fina
         throw new UnsupportedOperationException("getPayments(java.lang.Long, java.lang.Long, java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<AuditLogWithHistory> getPaymentMethodAuditLogsWithHistoryForId(final UUID paymentMethodId, final AuditLevel auditLevel, final TenantContext context) {
-        throw new UnsupportedOperationException("getPaymentMethodAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public Payment getPayment(final UUID paymentId, final boolean withPluginInfo, final boolean withAttempts, final Iterable<PluginProperty> properties, final TenantContext context) {
         throw new UnsupportedOperationException("getPayment(java.util.UUID, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public List<AuditLogWithHistory> getPaymentMethodAuditLogsWithHistoryForId(final UUID paymentMethodId, final AuditLevel auditLevel, final TenantContext context) {
+        throw new UnsupportedOperationException("getPaymentMethodAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public Payment createVoidWithPaymentControl(final Account account, final UUID paymentId, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final PaymentOptions paymentOptions, final CallContext context) {
         throw new UnsupportedOperationException("createVoidWithPaymentControl(org.killbill.billing.account.api.Account, java.util.UUID, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -85,14 +83,14 @@ public UUID addPaymentMethodWithPaymentControl(final Account account, final Stri
         throw new UnsupportedOperationException("addPaymentMethodWithPaymentControl(org.killbill.billing.account.api.Account, java.lang.String, java.lang.String, boolean, org.killbill.billing.payment.api.PaymentMethodPlugin, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public Payment getPaymentByExternalKey(final String paymentExternalKey, final boolean withPluginInfo, final boolean withAttempts, final Iterable<PluginProperty> properties, final TenantContext context) {
-        throw new UnsupportedOperationException("getPaymentByExternalKey(java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public Payment createCapture(final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("createCapture(org.killbill.billing.account.api.Account, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public Payment getPaymentByExternalKey(final String paymentExternalKey, final boolean withPluginInfo, final boolean withAttempts, final Iterable<PluginProperty> properties, final TenantContext context) {
+        throw new UnsupportedOperationException("getPaymentByExternalKey(java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public List<AuditLogWithHistory> getPaymentAuditLogsWithHistoryForId(final UUID paymentId, final AuditLevel auditLevel, final TenantContext context) {
         throw new UnsupportedOperationException("getPaymentAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -133,14 +131,14 @@ public List<PaymentMethod> refreshPaymentMethods(final Account account, final It
         throw new UnsupportedOperationException("refreshPaymentMethods(org.killbill.billing.account.api.Account, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public Pagination<PaymentMethod> searchPaymentMethods(final String searchKey, final Long offset, final Long limit, final String pluginName, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final TenantContext context) {
-        throw new UnsupportedOperationException("searchPaymentMethods(java.lang.String, java.lang.Long, java.lang.Long, java.lang.String, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public PaymentMethod getPaymentMethodByExternalKey(final String paymentMethodExternalKey, final boolean includedInactive, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final TenantContext context) {
         throw new UnsupportedOperationException("getPaymentMethodByExternalKey(java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public Pagination<PaymentMethod> searchPaymentMethods(final String searchKey, final Long offset, final Long limit, final String pluginName, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final TenantContext context) {
+        throw new UnsupportedOperationException("searchPaymentMethods(java.lang.String, java.lang.Long, java.lang.Long, java.lang.String, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public Payment createChargebackWithPaymentControl(final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentTransactionExternalKey, final PaymentOptions paymentOptions, final CallContext context) {
         throw new UnsupportedOperationException("createChargebackWithPaymentControl(org.killbill.billing.account.api.Account, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -153,16 +151,16 @@ public UUID addPaymentMethod(final Account account, final String paymentMethodEx
         throw new UnsupportedOperationException("addPaymentMethod(org.killbill.billing.account.api.Account, java.lang.String, java.lang.String, boolean, org.killbill.billing.payment.api.PaymentMethodPlugin, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public void setDefaultPaymentMethod(final Account account, final UUID paymentMethodId, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("setDefaultPaymentMethod(org.killbill.billing.account.api.Account, java.util.UUID, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    public Payment createCredit(final Account account, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("createCredit(org.killbill.billing.account.api.Account, java.util.UUID, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
     public void cancelScheduledPaymentTransaction(final String paymentTransactionExternalKey, final CallContext context) {
         throw new UnsupportedOperationException("cancelScheduledPaymentTransaction(java.lang.String, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public Payment createCredit(final Account account, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("createCredit(org.killbill.billing.account.api.Account, java.util.UUID, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    public void setDefaultPaymentMethod(final Account account, final UUID paymentMethodId, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("setDefaultPaymentMethod(org.killbill.billing.account.api.Account, java.util.UUID, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
     public Payment createAuthorization(final Account account, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentExternalKey, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
@@ -173,14 +171,14 @@ public Pagination<PaymentMethod> getPaymentMethods(final Long offset, final Long
         throw new UnsupportedOperationException("getPaymentMethods(java.lang.Long, java.lang.Long, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public Payment createVoid(final Account account, final UUID paymentId, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
-        throw new UnsupportedOperationException("createVoid(org.killbill.billing.account.api.Account, java.util.UUID, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public Pagination<PaymentMethod> searchPaymentMethods(final String searchKey, final Long offset, final Long limit, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final TenantContext context) {
         throw new UnsupportedOperationException("searchPaymentMethods(java.lang.String, java.lang.Long, java.lang.Long, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public Payment createVoid(final Account account, final UUID paymentId, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
+        throw new UnsupportedOperationException("createVoid(org.killbill.billing.account.api.Account, java.util.UUID, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public void deletePaymentMethod(final Account account, final UUID paymentMethodId, final boolean deleteDefaultPaymentMethodWithAutoPayOff, final boolean forceDefaultPaymentMethodDeletion, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("deletePaymentMethod(org.killbill.billing.account.api.Account, java.util.UUID, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -197,22 +195,22 @@ public List<Payment> getAccountPayments(final UUID accountId, final boolean with
         throw new UnsupportedOperationException("getAccountPayments(java.util.UUID, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public Pagination<Payment> searchPayments(final String searchKey, final Long offset, final Long limit, final String pluginName, final boolean withPluginInfo, final boolean withAttempts, final Iterable<PluginProperty> properties, final TenantContext context) {
-        throw new UnsupportedOperationException("searchPayments(java.lang.String, java.lang.Long, java.lang.Long, java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public Payment createRefund(final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final DateTime effectiveDate, final String paymentTransactionExternalKey, final Iterable<PluginProperty> properties, final CallContext context) {
         throw new UnsupportedOperationException("createRefund(org.killbill.billing.account.api.Account, java.util.UUID, java.math.BigDecimal, org.killbill.billing.catalog.api.Currency, org.joda.time.DateTime, java.lang.String, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public Payment notifyPendingTransactionOfStateChangedWithPaymentControl(final Account account, final UUID paymentTransactionId, final boolean isSuccess, final PaymentOptions paymentOptions, final CallContext context) {
-        throw new UnsupportedOperationException("notifyPendingTransactionOfStateChangedWithPaymentControl(org.killbill.billing.account.api.Account, java.util.UUID, boolean, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    public Pagination<Payment> searchPayments(final String searchKey, final Long offset, final Long limit, final String pluginName, final boolean withPluginInfo, final boolean withAttempts, final Iterable<PluginProperty> properties, final TenantContext context) {
+        throw new UnsupportedOperationException("searchPayments(java.lang.String, java.lang.Long, java.lang.Long, java.lang.String, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
     public Payment createChargebackReversal(final Account account, final UUID paymentId, final DateTime effectiveDate, final String paymentTransactionExternalKey, final CallContext context) {
         throw new UnsupportedOperationException("createChargebackReversal(org.killbill.billing.account.api.Account, java.util.UUID, org.joda.time.DateTime, java.lang.String, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public Payment notifyPendingTransactionOfStateChangedWithPaymentControl(final Account account, final UUID paymentTransactionId, final boolean isSuccess, final PaymentOptions paymentOptions, final CallContext context) {
+        throw new UnsupportedOperationException("notifyPendingTransactionOfStateChangedWithPaymentControl(org.killbill.billing.account.api.Account, java.util.UUID, boolean, org.killbill.billing.payment.api.PaymentOptions, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public List<PaymentMethod> getAccountPaymentMethods(final UUID accountId, final boolean includedInactive, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final TenantContext context) {
         throw new UnsupportedOperationException("getAccountPaymentMethods(java.util.UUID, boolean, boolean, java.lang.Iterable<org.killbill.billing.payment.api.PluginProperty>, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -244,7 +242,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final PaymentApiImp that = (PaymentApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentAttemptImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentAttemptImp.java
index d0d7bf45..41f1738e 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentAttemptImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentAttemptImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -32,9 +32,7 @@
 import org.killbill.billing.payment.api.TransactionType;
 
 @JsonDeserialize( builder = PaymentAttemptImp.Builder.class )
-public class PaymentAttemptImp implements PaymentAttempt, Serializable {
-
-    private static final long serialVersionUID = 0x6754E4EB5E9F551L;
+public class PaymentAttemptImp implements PaymentAttempt {
 
     protected UUID accountId;
     protected BigDecimal amount;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentGatewayApiImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentGatewayApiImp.java
index 21a28c96..4a465e54 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentGatewayApiImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentGatewayApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -33,9 +33,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = PaymentGatewayApiImp.Builder.class )
-public class PaymentGatewayApiImp implements PaymentGatewayApi, Serializable {
-
-    private static final long serialVersionUID = 0x87B5E31851B496F9L;
+public class PaymentGatewayApiImp implements PaymentGatewayApi {
 
 
     public PaymentGatewayApiImp(final PaymentGatewayApiImp that) {
@@ -67,7 +65,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final PaymentGatewayApiImp that = (PaymentGatewayApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentImp.java
index ea2cba0d..90b069aa 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -32,9 +32,7 @@
 import org.killbill.billing.payment.api.PaymentTransaction;
 
 @JsonDeserialize( builder = PaymentImp.Builder.class )
-public class PaymentImp implements Payment, Serializable {
-
-    private static final long serialVersionUID = 0x7D2CBDE629F0CD4FL;
+public class PaymentImp implements Payment {
 
     protected UUID accountId;
     protected BigDecimal authAmount;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodImp.java
index 8f9eda7b..83b0011c 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.payment.api.PaymentMethodPlugin;
 
 @JsonDeserialize( builder = PaymentMethodImp.Builder.class )
-public class PaymentMethodImp implements PaymentMethod, Serializable {
-
-    private static final long serialVersionUID = 0x56F76B45BF91919BL;
+public class PaymentMethodImp implements PaymentMethod {
 
     protected UUID accountId;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodPluginImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodPluginImp.java
index cdb50124..127ea2ee 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodPluginImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentMethodPluginImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.payment.api.PluginProperty;
 
 @JsonDeserialize( builder = PaymentMethodPluginImp.Builder.class )
-public class PaymentMethodPluginImp implements PaymentMethodPlugin, Serializable {
-
-    private static final long serialVersionUID = 0x42CEDE7E9AF09E20L;
+public class PaymentMethodPluginImp implements PaymentMethodPlugin {
 
     protected String externalPaymentMethodId;
     protected boolean isDefaultPaymentMethod;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentOptionsImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentOptionsImp.java
index bc92dbbd..a7ab10fc 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentOptionsImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentOptionsImp.java
@@ -1,34 +1,32 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import org.killbill.billing.payment.api.PaymentOptions;
 
 @JsonDeserialize( builder = PaymentOptionsImp.Builder.class )
-public class PaymentOptionsImp implements PaymentOptions, Serializable {
-
-    private static final long serialVersionUID = 0xE4101CDCE0CB5796L;
+public class PaymentOptionsImp implements PaymentOptions {
 
     protected boolean isExternalPayment;
     protected List<String> paymentControlPluginNames;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentTransactionImp.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentTransactionImp.java
index 480d376a..c75a2748 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentTransactionImp.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/PaymentTransactionImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Objects;
@@ -32,9 +32,7 @@
 import org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin;
 
 @JsonDeserialize( builder = PaymentTransactionImp.Builder.class )
-public class PaymentTransactionImp implements PaymentTransaction, Serializable {
-
-    private static final long serialVersionUID = 0x1B067DE9A179213FL;
+public class PaymentTransactionImp implements PaymentTransaction {
 
     protected BigDecimal amount;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/payment/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/payment/api/boilerplate/Resolver.java
index 4b72735d..b09be96e 100644
--- a/src/main/java/org/killbill/billing/payment/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/payment/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/GatewayNotificationImp.java b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/GatewayNotificationImp.java
index 90cca2cd..360412d5 100644
--- a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/GatewayNotificationImp.java
+++ b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/GatewayNotificationImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.plugin.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -29,9 +29,7 @@
 import org.killbill.billing.payment.plugin.api.GatewayNotification;
 
 @JsonDeserialize( builder = GatewayNotificationImp.Builder.class )
-public class GatewayNotificationImp implements GatewayNotification, Serializable {
-
-    private static final long serialVersionUID = 0x4CAF1439F4E546C7L;
+public class GatewayNotificationImp implements GatewayNotification {
 
     protected String entity;
     protected Map<String, List<String>> headers;
diff --git a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/HostedPaymentPageFormDescriptorImp.java b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/HostedPaymentPageFormDescriptorImp.java
index 4a816f2c..44892e06 100644
--- a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/HostedPaymentPageFormDescriptorImp.java
+++ b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/HostedPaymentPageFormDescriptorImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.plugin.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor;
 
 @JsonDeserialize( builder = HostedPaymentPageFormDescriptorImp.Builder.class )
-public class HostedPaymentPageFormDescriptorImp implements HostedPaymentPageFormDescriptor, Serializable {
-
-    private static final long serialVersionUID = 0xB11ACD0862E725EBL;
+public class HostedPaymentPageFormDescriptorImp implements HostedPaymentPageFormDescriptor {
 
     protected List<PluginProperty> formFields;
     protected String formMethod;
diff --git a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Module.java
index 1a966bc5..beb34f1c 100644
--- a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.plugin.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/PaymentTransactionInfoPluginImp.java b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/PaymentTransactionInfoPluginImp.java
index f83ac507..addac9d0 100644
--- a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/PaymentTransactionInfoPluginImp.java
+++ b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/PaymentTransactionInfoPluginImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.plugin.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -33,9 +33,7 @@
 import org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin;
 
 @JsonDeserialize( builder = PaymentTransactionInfoPluginImp.Builder.class )
-public class PaymentTransactionInfoPluginImp implements PaymentTransactionInfoPlugin, Serializable {
-
-    private static final long serialVersionUID = 0x292A311E7FCC3204L;
+public class PaymentTransactionInfoPluginImp implements PaymentTransactionInfoPlugin {
 
     protected BigDecimal amount;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Resolver.java
index 0f703323..cc2f7317 100644
--- a/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/payment/plugin/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.payment.plugin.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/security/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/security/api/boilerplate/Module.java
index 860fbaa1..33fa5413 100644
--- a/src/main/java/org/killbill/billing/security/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/security/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.security.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/security/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/security/api/boilerplate/Resolver.java
index a43ee597..f9e59905 100644
--- a/src/main/java/org/killbill/billing/security/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/security/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.security.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/security/api/boilerplate/SecurityApiImp.java b/src/main/java/org/killbill/billing/security/api/boilerplate/SecurityApiImp.java
index a3a443bc..8df032d7 100644
--- a/src/main/java/org/killbill/billing/security/api/boilerplate/SecurityApiImp.java
+++ b/src/main/java/org/killbill/billing/security/api/boilerplate/SecurityApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.security.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -32,9 +32,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = SecurityApiImp.Builder.class )
-public class SecurityApiImp implements SecurityApi, Serializable {
-
-    private static final long serialVersionUID = 0x393376B2A663D474L;
+public class SecurityApiImp implements SecurityApi {
 
     protected boolean isSubjectAuthenticated;
 
@@ -63,14 +61,14 @@ public Set<String> getCurrentUserPermissions(final TenantContext context) {
         throw new UnsupportedOperationException("getCurrentUserPermissions(org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public void logout() {
-        throw new UnsupportedOperationException("logout() must be implemented.");
-    }
-    @Override
     public void login(final Object principal, final Object credentials) {
         throw new UnsupportedOperationException("login(java.lang.Object, java.lang.Object) must be implemented.");
     }
     @Override
+    public void logout() {
+        throw new UnsupportedOperationException("logout() must be implemented.");
+    }
+    @Override
     public List<String> getRoleDefinition(final String role, final TenantContext tenantContext) {
         throw new UnsupportedOperationException("getRoleDefinition(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -79,14 +77,14 @@ public void updateRoleDefinition(final String role, final List<String> permissio
         throw new UnsupportedOperationException("updateRoleDefinition(java.lang.String, java.util.List<java.lang.String>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public List<String> getUserRoles(final String username, final TenantContext tenantContext) {
-        throw new UnsupportedOperationException("getUserRoles(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public void invalidateUser(final String username, final CallContext context) {
         throw new UnsupportedOperationException("invalidateUser(java.lang.String, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
+    public List<String> getUserRoles(final String username, final TenantContext tenantContext) {
+        throw new UnsupportedOperationException("getUserRoles(java.lang.String, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public void updateUserRoles(final String username, final List<String> roles, final CallContext context) {
         throw new UnsupportedOperationException("updateUserRoles(java.lang.String, java.util.List<java.lang.String>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/Module.java
index 536b39e0..f7766dc2 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/Resolver.java
index 21703e3d..b0e50816 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantDataImp.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantDataImp.java
index 84149366..0872ae94 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantDataImp.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantDataImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.tenant.api.TenantData;
 
 @JsonDeserialize( builder = TenantDataImp.Builder.class )
-public class TenantDataImp implements TenantData, Serializable {
-
-    private static final long serialVersionUID = 0x1646CA31F127A6ABL;
+public class TenantDataImp implements TenantData {
 
     protected String apiKey;
     protected String apiSecret;
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantImp.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantImp.java
index 8c5aa784..908938d1 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantImp.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.tenant.api.Tenant;
 
 @JsonDeserialize( builder = TenantImp.Builder.class )
-public class TenantImp implements Tenant, Serializable {
-
-    private static final long serialVersionUID = 0x498EFABC439B2F67L;
+public class TenantImp implements Tenant {
 
     protected String apiKey;
     protected String apiSecret;
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantKVImp.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantKVImp.java
index cbf57691..57ac5ab9 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantKVImp.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantKVImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.tenant.api.TenantKV;
 
 @JsonDeserialize( builder = TenantKVImp.Builder.class )
-public class TenantKVImp implements TenantKV, Serializable {
-
-    private static final long serialVersionUID = 0x16584FF3DA31393BL;
+public class TenantKVImp implements TenantKV {
 
     protected DateTime createdDate;
     protected UUID id;
diff --git a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantUserApiImp.java b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantUserApiImp.java
index 1806c9dc..092a59fb 100644
--- a/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantUserApiImp.java
+++ b/src/main/java/org/killbill/billing/tenant/api/boilerplate/TenantUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.tenant.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -33,9 +33,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = TenantUserApiImp.Builder.class )
-public class TenantUserApiImp implements TenantUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x59CEA9C2896AAEABL;
+public class TenantUserApiImp implements TenantUserApi {
 
 
     public TenantUserApiImp(final TenantUserApiImp that) {
@@ -83,7 +81,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final TenantUserApiImp that = (TenantUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/Module.java
index e7d2e292..e96bf0cd 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/RawUsageRecordImp.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/RawUsageRecordImp.java
index d7f3015a..2b560f00 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/RawUsageRecordImp.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/RawUsageRecordImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.usage.api.RawUsageRecord;
 
 @JsonDeserialize( builder = RawUsageRecordImp.Builder.class )
-public class RawUsageRecordImp implements RawUsageRecord, Serializable {
-
-    private static final long serialVersionUID = 0x2D20F369B815B918L;
+public class RawUsageRecordImp implements RawUsageRecord {
 
     protected Long amount;
     protected LocalDate date;
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/Resolver.java
index c402bbf2..1b3e4914 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUnitImp.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUnitImp.java
index fc10924d..e96ee871 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUnitImp.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUnitImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.usage.api.RolledUpUnit;
 
 @JsonDeserialize( builder = RolledUpUnitImp.Builder.class )
-public class RolledUpUnitImp implements RolledUpUnit, Serializable {
-
-    private static final long serialVersionUID = 0xCD9ED4CA8356C279L;
+public class RolledUpUnitImp implements RolledUpUnit {
 
     protected Long amount;
     protected String unitType;
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUsageImp.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUsageImp.java
index 6c39809a..77a83fbc 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUsageImp.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/RolledUpUsageImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -29,9 +29,7 @@
 import org.killbill.billing.usage.api.RolledUpUsage;
 
 @JsonDeserialize( builder = RolledUpUsageImp.Builder.class )
-public class RolledUpUsageImp implements RolledUpUsage, Serializable {
-
-    private static final long serialVersionUID = 0x4A42500A5E79778BL;
+public class RolledUpUsageImp implements RolledUpUsage {
 
     protected LocalDate end;
     protected List<RolledUpUnit> rolledUpUnits;
diff --git a/src/main/java/org/killbill/billing/usage/api/boilerplate/UsageUserApiImp.java b/src/main/java/org/killbill/billing/usage/api/boilerplate/UsageUserApiImp.java
index efd446d8..5b528c4b 100644
--- a/src/main/java/org/killbill/billing/usage/api/boilerplate/UsageUserApiImp.java
+++ b/src/main/java/org/killbill/billing/usage/api/boilerplate/UsageUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.usage.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -33,9 +33,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = UsageUserApiImp.Builder.class )
-public class UsageUserApiImp implements UsageUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x2B306F9AF7276238L;
+public class UsageUserApiImp implements UsageUserApi {
 
 
     public UsageUserApiImp(final UsageUserApiImp that) {
@@ -63,7 +61,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final UsageUserApiImp that = (UsageUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/AuditUserApiImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/AuditUserApiImp.java
index 7bc61c74..dceb0731 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/AuditUserApiImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/AuditUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -33,9 +33,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = AuditUserApiImp.Builder.class )
-public class AuditUserApiImp implements AuditUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x9B2F8E758C911760L;
+public class AuditUserApiImp implements AuditUserApi {
 
 
     public AuditUserApiImp(final AuditUserApiImp that) {
@@ -63,7 +61,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final AuditUserApiImp that = (AuditUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/ColumnInfoImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/ColumnInfoImp.java
index 86727d99..5f185bf1 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/ColumnInfoImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/ColumnInfoImp.java
@@ -1,33 +1,31 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.util.api.ColumnInfo;
 
 @JsonDeserialize( builder = ColumnInfoImp.Builder.class )
-public class ColumnInfoImp implements ColumnInfo, Serializable {
-
-    private static final long serialVersionUID = 0xECD150FD4BCA919L;
+public class ColumnInfoImp implements ColumnInfo {
 
     protected String columnName;
     protected String dataType;
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/CustomFieldUserApiImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/CustomFieldUserApiImp.java
index ab21bd73..6463b780 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/CustomFieldUserApiImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/CustomFieldUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -35,9 +35,7 @@
 import org.killbill.billing.util.entity.Pagination;
 
 @JsonDeserialize( builder = CustomFieldUserApiImp.Builder.class )
-public class CustomFieldUserApiImp implements CustomFieldUserApi, Serializable {
-
-    private static final long serialVersionUID = 0xBDAF40CD5C888F3AL;
+public class CustomFieldUserApiImp implements CustomFieldUserApi {
 
 
     public CustomFieldUserApiImp(final CustomFieldUserApiImp that) {
@@ -54,10 +52,6 @@ public List<CustomField> getCustomFieldsForAccount(final UUID accountId, final T
         throw new UnsupportedOperationException("getCustomFieldsForAccount(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<AuditLogWithHistory> getCustomFieldAuditLogsWithHistoryForId(final UUID customFieldId, final AuditLevel auditLevel, final TenantContext context) {
-        throw new UnsupportedOperationException("getCustomFieldAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
     public void removeCustomFields(final List<CustomField> fields, final CallContext context) {
         throw new UnsupportedOperationException("removeCustomFields(java.util.List<org.killbill.billing.util.customfield.CustomField>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
@@ -66,6 +60,10 @@ public Pagination<CustomField> searchCustomFields(final String fieldName, final
         throw new UnsupportedOperationException("searchCustomFields(java.lang.String, java.lang.String, org.killbill.billing.ObjectType, java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public List<AuditLogWithHistory> getCustomFieldAuditLogsWithHistoryForId(final UUID customFieldId, final AuditLevel auditLevel, final TenantContext context) {
+        throw new UnsupportedOperationException("getCustomFieldAuditLogsWithHistoryForId(java.util.UUID, org.killbill.billing.util.api.AuditLevel, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
     public List<CustomField> getCustomFieldsForAccountType(final UUID accountId, final ObjectType objectType, final TenantContext context) {
         throw new UnsupportedOperationException("getCustomFieldsForAccountType(java.util.UUID, org.killbill.billing.ObjectType, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -78,14 +76,14 @@ public Pagination<CustomField> searchCustomFields(final String fieldName, final
         throw new UnsupportedOperationException("searchCustomFields(java.lang.String, org.killbill.billing.ObjectType, java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public void updateCustomFields(final List<CustomField> fields, final CallContext context) {
-        throw new UnsupportedOperationException("updateCustomFields(java.util.List<org.killbill.billing.util.customfield.CustomField>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
-    }
-    @Override
     public Pagination<CustomField> searchCustomFields(final String searchKey, final Long offset, final Long limit, final TenantContext context) {
         throw new UnsupportedOperationException("searchCustomFields(java.lang.String, java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
+    public void updateCustomFields(final List<CustomField> fields, final CallContext context) {
+        throw new UnsupportedOperationException("updateCustomFields(java.util.List<org.killbill.billing.util.customfield.CustomField>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    }
+    @Override
     public Pagination<CustomField> getCustomFields(final Long offset, final Long limit, final TenantContext context) {
         throw new UnsupportedOperationException("getCustomFields(java.lang.Long, java.lang.Long, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
@@ -97,7 +95,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final CustomFieldUserApiImp that = (CustomFieldUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/DatabaseExportOutputStreamImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/DatabaseExportOutputStreamImp.java
index 72c16765..dc192fcb 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/DatabaseExportOutputStreamImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/DatabaseExportOutputStreamImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.api.DatabaseExportOutputStream;
 
 @JsonDeserialize( builder = DatabaseExportOutputStreamImp.Builder.class )
-public class DatabaseExportOutputStreamImp implements DatabaseExportOutputStream, Serializable {
-
-    private static final long serialVersionUID = 0x400EFAC84C0DD8B3L;
+public class DatabaseExportOutputStreamImp implements DatabaseExportOutputStream {
 
 
     public DatabaseExportOutputStreamImp(final DatabaseExportOutputStreamImp that) {
@@ -55,7 +53,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final DatabaseExportOutputStreamImp that = (DatabaseExportOutputStreamImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/ExportUserApiImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/ExportUserApiImp.java
index 99d6ab77..874a44e5 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/ExportUserApiImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/ExportUserApiImp.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
@@ -20,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.io.OutputStream;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.callcontext.CallContext;
 
 @JsonDeserialize( builder = ExportUserApiImp.Builder.class )
-public class ExportUserApiImp implements ExportUserApi, Serializable {
-
-    private static final long serialVersionUID = 0x34EA044484F07B17L;
+public class ExportUserApiImp implements ExportUserApi {
 
 
     public ExportUserApiImp(final ExportUserApiImp that) {
@@ -55,7 +53,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final ExportUserApiImp that = (ExportUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/api/boilerplate/Module.java
index 3c79138a..abc06015 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/RecordIdApiImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/RecordIdApiImp.java
index 5a0940a4..3daf0aa7 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/RecordIdApiImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/RecordIdApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = RecordIdApiImp.Builder.class )
-public class RecordIdApiImp implements RecordIdApi, Serializable {
-
-    private static final long serialVersionUID = 0xC0DB0004BC757D37L;
+public class RecordIdApiImp implements RecordIdApi {
 
 
     public RecordIdApiImp(final RecordIdApiImp that) {
@@ -50,7 +48,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final RecordIdApiImp that = (RecordIdApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/api/boilerplate/Resolver.java
index e23fc56e..a7808bc5 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/api/boilerplate/TagUserApiImp.java b/src/main/java/org/killbill/billing/util/api/boilerplate/TagUserApiImp.java
index cdc4bd49..86a1783a 100644
--- a/src/main/java/org/killbill/billing/util/api/boilerplate/TagUserApiImp.java
+++ b/src/main/java/org/killbill/billing/util/api/boilerplate/TagUserApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.api.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -39,9 +39,7 @@
 import org.killbill.billing.util.tag.TagDefinition;
 
 @JsonDeserialize( builder = TagUserApiImp.Builder.class )
-public class TagUserApiImp implements TagUserApi, Serializable {
-
-    private static final long serialVersionUID = 0xEDC141D1F9BD398AL;
+public class TagUserApiImp implements TagUserApi {
 
 
     public TagUserApiImp(final TagUserApiImp that) {
@@ -82,20 +80,20 @@ public TagDefinition createTagDefinition(final String definitionName, final Stri
         throw new UnsupportedOperationException("createTagDefinition(java.lang.String, java.lang.String, java.util.Set<org.killbill.billing.ObjectType>, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
-    public TagDefinition getTagDefinition(final UUID tagDefinitionId, final TenantContext context) {
-        throw new UnsupportedOperationException("getTagDefinition(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
-    }
-    @Override
-    public void deleteTagDefinition(final UUID tagDefinitionId, final CallContext context) {
-        throw new UnsupportedOperationException("deleteTagDefinition(java.util.UUID, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
+    public List<Tag> getTagsForAccountType(final UUID accountId, final ObjectType objectType, final boolean includedDeleted, final TenantContext context) {
+        throw new UnsupportedOperationException("getTagsForAccountType(java.util.UUID, org.killbill.billing.ObjectType, boolean, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
     public List<Tag> getTagsForAccount(final UUID accountId, final boolean includedDeleted, final TenantContext context) {
         throw new UnsupportedOperationException("getTagsForAccount(java.util.UUID, boolean, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
     }
     @Override
-    public List<Tag> getTagsForAccountType(final UUID accountId, final ObjectType objectType, final boolean includedDeleted, final TenantContext context) {
-        throw new UnsupportedOperationException("getTagsForAccountType(java.util.UUID, org.killbill.billing.ObjectType, boolean, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    public TagDefinition getTagDefinition(final UUID tagDefinitionId, final TenantContext context) {
+        throw new UnsupportedOperationException("getTagDefinition(java.util.UUID, org.killbill.billing.util.callcontext.TenantContext) must be implemented.");
+    }
+    @Override
+    public void deleteTagDefinition(final UUID tagDefinitionId, final CallContext context) {
+        throw new UnsupportedOperationException("deleteTagDefinition(java.util.UUID, org.killbill.billing.util.callcontext.CallContext) must be implemented.");
     }
     @Override
     public List<AuditLogWithHistory> getTagAuditLogsWithHistoryForId(final UUID tagId, final AuditLevel auditLevel, final TenantContext context) {
@@ -125,7 +123,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final TagUserApiImp that = (TagUserApiImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsForObjectTypeImp.java b/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsForObjectTypeImp.java
index 33b2c6c3..9a292446 100644
--- a/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsForObjectTypeImp.java
+++ b/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsForObjectTypeImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.audit.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.audit.AuditLog;
 
 @JsonDeserialize( builder = AccountAuditLogsForObjectTypeImp.Builder.class )
-public class AccountAuditLogsForObjectTypeImp implements AccountAuditLogsForObjectType, Serializable {
-
-    private static final long serialVersionUID = 0xB3553F1B265966FAL;
+public class AccountAuditLogsForObjectTypeImp implements AccountAuditLogsForObjectType {
 
 
     public AccountAuditLogsForObjectTypeImp(final AccountAuditLogsForObjectTypeImp that) {
@@ -50,7 +48,6 @@ public boolean equals(final Object o) {
         if ( ( o == null ) || ( this.getClass() != o.getClass() ) ) {
             return false;
         }
-        final AccountAuditLogsForObjectTypeImp that = (AccountAuditLogsForObjectTypeImp) o;
         return true;
     }
     @Override
diff --git a/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsImp.java b/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsImp.java
index 7cc19748..556a1deb 100644
--- a/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsImp.java
+++ b/src/main/java/org/killbill/billing/util/audit/boilerplate/AccountAuditLogsImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.audit.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -30,9 +30,7 @@
 import org.killbill.billing.util.audit.AuditLog;
 
 @JsonDeserialize( builder = AccountAuditLogsImp.Builder.class )
-public class AccountAuditLogsImp implements AccountAuditLogs, Serializable {
-
-    private static final long serialVersionUID = 0xFBF3458749273B1CL;
+public class AccountAuditLogsImp implements AccountAuditLogs {
 
     protected List<AuditLog> auditLogs;
     protected List<AuditLog> auditLogsForAccount;
@@ -91,26 +89,26 @@ public List<AuditLog> getAuditLogsForInvoicePayment(final UUID invoicePaymentId)
         throw new UnsupportedOperationException("getAuditLogsForInvoicePayment(java.util.UUID) must be implemented.");
     }
     @Override
-    public List<AuditLog> getAuditLogsForPayment(final UUID paymentId) {
-        throw new UnsupportedOperationException("getAuditLogsForPayment(java.util.UUID) must be implemented.");
-    }
-    @Override
     public List<AuditLog> getAuditLogsForInvoice(final UUID invoiceId) {
         throw new UnsupportedOperationException("getAuditLogsForInvoice(java.util.UUID) must be implemented.");
     }
     @Override
-    public List<AuditLog> getAuditLogsForPaymentAttempt(final UUID paymentAttemptId) {
-        throw new UnsupportedOperationException("getAuditLogsForPaymentAttempt(java.util.UUID) must be implemented.");
+    public List<AuditLog> getAuditLogsForPayment(final UUID paymentId) {
+        throw new UnsupportedOperationException("getAuditLogsForPayment(java.util.UUID) must be implemented.");
     }
     @Override
-    public List<AuditLog> getAuditLogsForBundle(final UUID bundleId) {
-        throw new UnsupportedOperationException("getAuditLogsForBundle(java.util.UUID) must be implemented.");
+    public List<AuditLog> getAuditLogsForPaymentAttempt(final UUID paymentAttemptId) {
+        throw new UnsupportedOperationException("getAuditLogsForPaymentAttempt(java.util.UUID) must be implemented.");
     }
     @Override
     public List<AuditLog> getAuditLogsForPaymentTransaction(final UUID paymentTransactionId) {
         throw new UnsupportedOperationException("getAuditLogsForPaymentTransaction(java.util.UUID) must be implemented.");
     }
     @Override
+    public List<AuditLog> getAuditLogsForBundle(final UUID bundleId) {
+        throw new UnsupportedOperationException("getAuditLogsForBundle(java.util.UUID) must be implemented.");
+    }
+    @Override
     public boolean equals(final Object o) {
         if ( this == o ) {
             return true;
diff --git a/src/main/java/org/killbill/billing/util/audit/boilerplate/AuditLogImp.java b/src/main/java/org/killbill/billing/util/audit/boilerplate/AuditLogImp.java
index 4401b78f..d88b7fec 100644
--- a/src/main/java/org/killbill/billing/util/audit/boilerplate/AuditLogImp.java
+++ b/src/main/java/org/killbill/billing/util/audit/boilerplate/AuditLogImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.audit.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.audit.ChangeType;
 
 @JsonDeserialize( builder = AuditLogImp.Builder.class )
-public class AuditLogImp implements AuditLog, Serializable {
-
-    private static final long serialVersionUID = 0x16152909987F8908L;
+public class AuditLogImp implements AuditLog {
 
     protected UUID auditedEntityId;
     protected ObjectType auditedObjectType;
diff --git a/src/main/java/org/killbill/billing/util/audit/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/audit/boilerplate/Module.java
index 62870e85..a5d65062 100644
--- a/src/main/java/org/killbill/billing/util/audit/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/audit/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.audit.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/audit/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/audit/boilerplate/Resolver.java
index 94372d95..ae04f365 100644
--- a/src/main/java/org/killbill/billing/util/audit/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/audit/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.audit.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/CallContextImp.java b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/CallContextImp.java
index 51dafe05..dcd411e3 100644
--- a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/CallContextImp.java
+++ b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/CallContextImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.callcontext.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.callcontext.UserType;
 
 @JsonDeserialize( builder = CallContextImp.Builder.class )
-public class CallContextImp implements CallContext, Serializable {
-
-    private static final long serialVersionUID = 0xC2DEFB0ADAB50F6AL;
+public class CallContextImp implements CallContext {
 
     protected UUID accountId;
     protected CallOrigin callOrigin;
diff --git a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Module.java
index 71454921..424eb034 100644
--- a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.callcontext.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Resolver.java
index 8e7f59d6..399d35af 100644
--- a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.callcontext.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/TenantContextImp.java b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/TenantContextImp.java
index c0dc9d7e..0907ed6a 100644
--- a/src/main/java/org/killbill/billing/util/callcontext/boilerplate/TenantContextImp.java
+++ b/src/main/java/org/killbill/billing/util/callcontext/boilerplate/TenantContextImp.java
@@ -1,34 +1,32 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.callcontext.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
 import org.killbill.billing.util.callcontext.TenantContext;
 
 @JsonDeserialize( builder = TenantContextImp.Builder.class )
-public class TenantContextImp implements TenantContext, Serializable {
-
-    private static final long serialVersionUID = 0x31D7DDF355CBD496L;
+public class TenantContextImp implements TenantContext {
 
     protected UUID accountId;
     protected UUID tenantId;
diff --git a/src/main/java/org/killbill/billing/util/customfield/boilerplate/CustomFieldImp.java b/src/main/java/org/killbill/billing/util/customfield/boilerplate/CustomFieldImp.java
index e8b0dade..e27bd734 100644
--- a/src/main/java/org/killbill/billing/util/customfield/boilerplate/CustomFieldImp.java
+++ b/src/main/java/org/killbill/billing/util/customfield/boilerplate/CustomFieldImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.customfield.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.customfield.CustomField;
 
 @JsonDeserialize( builder = CustomFieldImp.Builder.class )
-public class CustomFieldImp implements CustomField, Serializable {
-
-    private static final long serialVersionUID = 0x9E64A364C19AB705L;
+public class CustomFieldImp implements CustomField {
 
     protected DateTime createdDate;
     protected String fieldName;
diff --git a/src/main/java/org/killbill/billing/util/customfield/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/customfield/boilerplate/Module.java
index 769de2db..9a4d702d 100644
--- a/src/main/java/org/killbill/billing/util/customfield/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/customfield/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.customfield.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/customfield/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/customfield/boilerplate/Resolver.java
index 05b05757..4628ce4a 100644
--- a/src/main/java/org/killbill/billing/util/customfield/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/customfield/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.customfield.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/entity/boilerplate/EntityImp.java b/src/main/java/org/killbill/billing/util/entity/boilerplate/EntityImp.java
index 1a3ff554..68b62e20 100644
--- a/src/main/java/org/killbill/billing/util/entity/boilerplate/EntityImp.java
+++ b/src/main/java/org/killbill/billing/util/entity/boilerplate/EntityImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.entity.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -27,9 +27,7 @@
 import org.killbill.billing.util.entity.Entity;
 
 @JsonDeserialize( builder = EntityImp.Builder.class )
-public class EntityImp implements Entity, Serializable {
-
-    private static final long serialVersionUID = 0x80416CA1F103FE6FL;
+public class EntityImp implements Entity {
 
     protected DateTime createdDate;
     protected UUID id;
diff --git a/src/main/java/org/killbill/billing/util/entity/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/entity/boilerplate/Module.java
index 31a0472a..5a586e4c 100644
--- a/src/main/java/org/killbill/billing/util/entity/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/entity/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.entity.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/entity/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/entity/boilerplate/Resolver.java
index 0a9f5908..3fa90b43 100644
--- a/src/main/java/org/killbill/billing/util/entity/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/entity/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.entity.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/KillbillNodesApiImp.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/KillbillNodesApiImp.java
index a9677b27..0db06411 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/KillbillNodesApiImp.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/KillbillNodesApiImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.osgi.api.PluginInfo;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.nodes.NodeInfo;
 
 @JsonDeserialize( builder = KillbillNodesApiImp.Builder.class )
-public class KillbillNodesApiImp implements KillbillNodesApi, Serializable {
-
-    private static final long serialVersionUID = 0x8FC81437A4796EABL;
+public class KillbillNodesApiImp implements KillbillNodesApi {
 
     protected NodeInfo currentNodeInfo;
     protected Iterable<NodeInfo> nodesInfo;
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/Module.java
index 50470c4b..1856642a 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandImp.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandImp.java
index d2682941..229e4d42 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandImp.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandImp.java
@@ -1,34 +1,32 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.killbill.billing.util.nodes.NodeCommand;
 import org.killbill.billing.util.nodes.NodeCommandMetadata;
 
 @JsonDeserialize( builder = NodeCommandImp.Builder.class )
-public class NodeCommandImp implements NodeCommand, Serializable {
-
-    private static final long serialVersionUID = 0xACC5A6CA0AF22EEFL;
+public class NodeCommandImp implements NodeCommand {
 
     protected boolean isSystemCommandType;
     protected NodeCommandMetadata nodeCommandMetadata;
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandMetadataImp.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandMetadataImp.java
index 5e95fcd5..44211f14 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandMetadataImp.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeCommandMetadataImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -27,9 +27,7 @@
 import org.killbill.billing.util.nodes.NodeCommandProperty;
 
 @JsonDeserialize( builder = NodeCommandMetadataImp.Builder.class )
-public class NodeCommandMetadataImp implements NodeCommandMetadata, Serializable {
-
-    private static final long serialVersionUID = 0xD541D122123FD230L;
+public class NodeCommandMetadataImp implements NodeCommandMetadata {
 
     protected List<NodeCommandProperty> properties;
 
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeInfoImp.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeInfoImp.java
index 040805b3..3019f27c 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeInfoImp.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/NodeInfoImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import org.joda.time.DateTime;
@@ -27,9 +27,7 @@
 import org.killbill.billing.util.nodes.NodeInfo;
 
 @JsonDeserialize( builder = NodeInfoImp.Builder.class )
-public class NodeInfoImp implements NodeInfo, Serializable {
-
-    private static final long serialVersionUID = 0xF60FCF394C2541BBL;
+public class NodeInfoImp implements NodeInfo {
 
     protected String apiVersion;
     protected DateTime bootTime;
diff --git a/src/main/java/org/killbill/billing/util/nodes/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/nodes/boilerplate/Resolver.java
index c7c6dd4b..a583d0d3 100644
--- a/src/main/java/org/killbill/billing/util/nodes/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/nodes/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.nodes.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/tag/boilerplate/ControlTagImp.java b/src/main/java/org/killbill/billing/util/tag/boilerplate/ControlTagImp.java
index 7596ab23..247d77ba 100644
--- a/src/main/java/org/killbill/billing/util/tag/boilerplate/ControlTagImp.java
+++ b/src/main/java/org/killbill/billing/util/tag/boilerplate/ControlTagImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.tag.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.tag.ControlTagType;
 
 @JsonDeserialize( builder = ControlTagImp.Builder.class )
-public class ControlTagImp implements ControlTag, Serializable {
-
-    private static final long serialVersionUID = 0xEF4996C6C6B04CDDL;
+public class ControlTagImp implements ControlTag {
 
     protected ControlTagType controlTagType;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/util/tag/boilerplate/Module.java b/src/main/java/org/killbill/billing/util/tag/boilerplate/Module.java
index e7e7421e..909cf88b 100644
--- a/src/main/java/org/killbill/billing/util/tag/boilerplate/Module.java
+++ b/src/main/java/org/killbill/billing/util/tag/boilerplate/Module.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.tag.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/tag/boilerplate/Resolver.java b/src/main/java/org/killbill/billing/util/tag/boilerplate/Resolver.java
index eac1f27b..2c09f0de 100644
--- a/src/main/java/org/killbill/billing/util/tag/boilerplate/Resolver.java
+++ b/src/main/java/org/killbill/billing/util/tag/boilerplate/Resolver.java
@@ -1,18 +1,19 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.tag.boilerplate;
diff --git a/src/main/java/org/killbill/billing/util/tag/boilerplate/TagDefinitionImp.java b/src/main/java/org/killbill/billing/util/tag/boilerplate/TagDefinitionImp.java
index 48457d1d..177c1294 100644
--- a/src/main/java/org/killbill/billing/util/tag/boilerplate/TagDefinitionImp.java
+++ b/src/main/java/org/killbill/billing/util/tag/boilerplate/TagDefinitionImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.tag.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -29,9 +29,7 @@
 import org.killbill.billing.util.tag.TagDefinition;
 
 @JsonDeserialize( builder = TagDefinitionImp.Builder.class )
-public class TagDefinitionImp implements TagDefinition, Serializable {
-
-    private static final long serialVersionUID = 0x1E675F37B641DBABL;
+public class TagDefinitionImp implements TagDefinition {
 
     protected List<ObjectType> applicableObjectTypes;
     protected DateTime createdDate;
diff --git a/src/main/java/org/killbill/billing/util/tag/boilerplate/TagImp.java b/src/main/java/org/killbill/billing/util/tag/boilerplate/TagImp.java
index 7201a195..a9e5ab21 100644
--- a/src/main/java/org/killbill/billing/util/tag/boilerplate/TagImp.java
+++ b/src/main/java/org/killbill/billing/util/tag/boilerplate/TagImp.java
@@ -1,25 +1,25 @@
-/* This is generated code, edit with caution! */
 /*
- * Copyright 2022-2022 The Billing Project, LLC
+ *  Generated by https://github.com/killbill/api-pojos. Do not edit!
  *
- * The Billing Project 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:
+ *  Copyright 2022-2022 The Billing Project, LLC
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  The Billing Project 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:
  *
- * 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.
+ *     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 org.killbill.billing.util.tag.boilerplate;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,9 +28,7 @@
 import org.killbill.billing.util.tag.Tag;
 
 @JsonDeserialize( builder = TagImp.Builder.class )
-public class TagImp implements Tag, Serializable {
-
-    private static final long serialVersionUID = 0x539F63B6FE1DFED5L;
+public class TagImp implements Tag {
 
     protected DateTime createdDate;
     protected UUID id;
diff --git a/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module b/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module
index 96d24d28..1c3b7ac9 100644
--- a/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module
+++ b/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module
@@ -1,4 +1,19 @@
-#This is generated code, edit with caution!
+#  Generated by https://github.com/killbill/api-pojos. Do not edit!
+#  
+#  Copyright 2022-2022 The Billing Project, LLC
+#  
+#  The Billing Project 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.
+
 org.killbill.billing.util.customfield.boilerplate.Module
 org.killbill.billing.security.api.boilerplate.Module
 org.killbill.billing.osgi.api.config.boilerplate.Module