diff --git a/src/main/java/cat/nyaa/nyaabank/BankManagementCommands.java b/src/main/java/cat/nyaa/nyaabank/BankManagementCommands.java
index bdd2613..10427fc 100644
--- a/src/main/java/cat/nyaa/nyaabank/BankManagementCommands.java
+++ b/src/main/java/cat/nyaa/nyaabank/BankManagementCommands.java
@@ -155,7 +155,7 @@ public void changeInterestInfo(CommandSender sender, Arguments args) {
                 }
                 bank.savingInterestNext = newSaving;
                 plugin.dbm.query(BankRegistration.class)
-                        .whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
+                        .whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
                         .update(bank, BankRegistration.N_INTEREST_RATE_SAVING_NEXT);
                 break;
             }
@@ -171,7 +171,7 @@ public void changeInterestInfo(CommandSender sender, Arguments args) {
                 }
                 bank.debitInterestNext = newLoan;
                 plugin.dbm.query(BankRegistration.class)
-                        .whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
+                        .whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
                         .update(bank, BankRegistration.N_INTEREST_RATE_DEBIT_NEXT);
                 break;
             }
@@ -179,7 +179,7 @@ public void changeInterestInfo(CommandSender sender, Arguments args) {
                 InterestType newType = args.nextEnum(InterestType.class);
                 bank.interestTypeNext = newType;
                 plugin.dbm.query(BankRegistration.class)
-                        .whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString())
+                        .whereEq(BankRegistration.N_BANK_ID, bank.getBankId())
                         .update(bank, BankRegistration.N_INTEREST_TYPE_NEXT);
                 break;
             }
@@ -196,7 +196,7 @@ public void listCustomers(CommandSender sender, Arguments args) {
         Map<UUID, BankAccount> accounts = new HashMap<>();
         Multimap<UUID, PartialRecord> partials = HashMultimap.create();
         for (BankAccount a : plugin.dbm.query(BankAccount.class)
-                .whereEq(BankAccount.N_BANK_ID, bank.bankId).select()) {
+                .whereEq(BankAccount.N_BANK_ID, bank.getBankId()).select()) {
             if (accounts.containsKey(a.playerId)) {
                 plugin.getLogger().severe(String.format("Multiple accounts bank-id=%s, player-id=%s",
                         bank.bankId.toString(), a.playerId));
@@ -204,7 +204,7 @@ public void listCustomers(CommandSender sender, Arguments args) {
             accounts.put(a.playerId, a);
         }
         for (PartialRecord p : plugin.dbm.query(PartialRecord.class)
-                .whereEq(PartialRecord.N_BANK_ID, bank.bankId).select()) {
+                .whereEq(PartialRecord.N_BANK_ID, bank.getBankId()).select()) {
             partials.put(p.playerId, p);
         }
 
diff --git a/src/main/java/cat/nyaa/nyaabank/CommonAction.java b/src/main/java/cat/nyaa/nyaabank/CommonAction.java
index d164420..d134be0 100644
--- a/src/main/java/cat/nyaa/nyaabank/CommonAction.java
+++ b/src/main/java/cat/nyaa/nyaabank/CommonAction.java
@@ -63,12 +63,12 @@ public static void withdraw(NyaaBank plugin, Player player, BankRegistration ban
                 account.deposit = 0D;
                 account.deposit_interest = 0D;
                 plugin.dbm.query(BankAccount.class)
-                        .whereEq(BankAccount.N_ACCOUNT_ID, account.accountId)
+                        .whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId())
                         .update(account, BankAccount.N_DEPOSIT, BankAccount.N_DEPOSIT_INTEREST);
             }
             plugin.dbm.query(PartialRecord.class)
-                    .whereEq(PartialRecord.N_BANK_ID, bank.bankId.toString())
-                    .whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId())
+                    .whereEq(PartialRecord.N_BANK_ID, bank.getBankId())
+                    .whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId().toString())
                     .whereEq(PartialRecord.N_TRANSACTION_TYPE, TransactionType.DEPOSIT.name())
                     .delete();
             plugin.eco.withdrawPlayer(banker, totalDeposit);
@@ -88,13 +88,13 @@ public static void withdraw(NyaaBank plugin, Player player, BankRegistration ban
                 if (amount > r.capital) {
                     amount -= r.capital;
                     realAmount += r.capital;
-                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString()).delete();
+                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId()).delete();
                     idx++;
                 } else {
                     realAmount += amount;
                     r.capital -= amount;
                     amount = -1;
-                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString())
+                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId())
                             .update(r, PartialRecord.N_CAPITAL);
                 }
             }
@@ -174,12 +174,12 @@ public static void repay(NyaaBank plugin, Player player, BankRegistration bank,
                 account.loan = 0D;
                 account.loan_interest = 0D;
                 plugin.dbm.query(BankAccount.class)
-                        .whereEq(BankAccount.N_ACCOUNT_ID, account.accountId)
+                        .whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId())
                         .update(account, BankAccount.N_LOAN, BankAccount.N_LOAN_INTEREST);
             }
             plugin.dbm.query(PartialRecord.class)
-                    .whereEq(PartialRecord.N_BANK_ID, bank.bankId.toString())
-                    .whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId())
+                    .whereEq(PartialRecord.N_BANK_ID, bank.getBankId())
+                    .whereEq(PartialRecord.N_PLAYER_ID, player.getUniqueId().toString())
                     .whereEq(PartialRecord.N_TRANSACTION_TYPE, TransactionType.LOAN.name())
                     .delete();
             plugin.eco.depositPlayer(banker, totalLoan);
@@ -199,13 +199,13 @@ public static void repay(NyaaBank plugin, Player player, BankRegistration bank,
                 if (amount > r.capital) {
                     amount -= r.capital;
                     realAmount += r.capital;
-                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString()).delete();
+                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId()).delete();
                     idx++;
                 } else {
                     realAmount += amount;
                     r.capital -= amount;
                     amount = -1;
-                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.transactionId.toString())
+                    plugin.dbm.query(PartialRecord.class).whereEq(PartialRecord.N_TRANSACTION_ID, r.getTransactionId())
                             .update(r, PartialRecord.N_CAPITAL);
                 }
             }
diff --git a/src/main/java/cat/nyaa/nyaabank/database/CycleManager.java b/src/main/java/cat/nyaa/nyaabank/database/CycleManager.java
index 83ef58b..fd90990 100644
--- a/src/main/java/cat/nyaa/nyaabank/database/CycleManager.java
+++ b/src/main/java/cat/nyaa/nyaabank/database/CycleManager.java
@@ -276,12 +276,12 @@ public void updateDatabaseInterests(long designatedTimestamp, long cycleLength)
         // write to database
         DatabaseManager.Query<BankRegistration> query1 = plugin.dbm.query(BankRegistration.class);
         for (BankRegistration bank : bankMap.values()) {
-            query1.clear().whereEq(BankRegistration.N_BANK_ID, bank.bankId.toString()).update(bank);
+            query1.clear().whereEq(BankRegistration.N_BANK_ID, bank.getBankId()).update(bank);
         }
         DatabaseManager.Query<BankAccount> query2 = plugin.dbm.query(BankAccount.class);
         for (Map<UUID, BankAccount> m : accountMap.values()) {
             for (BankAccount account : m.values()) {
-                query2.clear().whereEq(BankAccount.N_ACCOUNT_ID, account.accountId.toString()).update(account);
+                query2.clear().whereEq(BankAccount.N_ACCOUNT_ID, account.getAccountId()).update(account);
             }
         }
         plugin.dbm.query(PartialRecord.class).delete();