diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala
index f14837a1f..9507cc101 100644
--- a/obp-api/src/main/scala/code/api/util/Glossary.scala
+++ b/obp-api/src/main/scala/code/api/util/Glossary.scala
@@ -3534,7 +3534,7 @@ object Glossary extends MdcLoggable  {
         .filter(_.getName.endsWith(".md"))
         .toList
     } else {
-			logger.error(s"Do not have any files under glossary path ($glossaryPath), please double check the folder path: $glossaryPath")
+			logger.error(s"There are no glossary files under the path ($glossaryPath), please double check the folder path: $glossaryPath")
       List.empty[File]
     }
   }
diff --git a/obp-api/src/main/scala/code/bankaccountbalance/BankAccountBalance.scala b/obp-api/src/main/scala/code/bankaccountbalance/BankAccountBalance.scala
index 5f6e0712c..68443de9d 100644
--- a/obp-api/src/main/scala/code/bankaccountbalance/BankAccountBalance.scala
+++ b/obp-api/src/main/scala/code/bankaccountbalance/BankAccountBalance.scala
@@ -8,10 +8,13 @@ import net.liftweb.mapper._
 import net.liftweb.util.Helpers.tryo
 
 
-class BankAccountBalance extends BankAccountBalanceTrait with LongKeyedMapper[BankAccountBalance] with CreatedUpdated with IdPK {
+class BankAccountBalance extends BankAccountBalanceTrait with KeyedMapper[String, BankAccountBalance]{
 
   override def getSingleton = BankAccountBalance
 
+  // Define BalanceId_ as the primary key
+  override def primaryKeyField = BalanceId_.asInstanceOf[KeyedMetaMapper[String, BankAccountBalance]].primaryKeyField
+  
   object BankId_ extends MappedUUID(this)
   object AccountId_ extends MappedUUID(this)
   object BalanceId_ extends MappedUUID(this)
@@ -33,4 +36,4 @@ class BankAccountBalance extends BankAccountBalanceTrait with LongKeyedMapper[Ba
   override def balanceAmount: BigDecimal = Helper.smallestCurrencyUnitToBigDecimal(BalanceAmount.get, foreignMappedBankAccountCurrency)
 }
 
-object BankAccountBalance extends BankAccountBalance with LongKeyedMetaMapper[BankAccountBalance] {}
+object BankAccountBalance extends BankAccountBalance  with KeyedMetaMapper[String, BankAccountBalance] with CreatedUpdated {}