diff --git a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java
index 3358a2e..b7e7450 100644
--- a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java
+++ b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java
@@ -79,6 +79,9 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor
         Properties info = new Properties();
         info.put("user", context.getUsername());
         info.put("password", context.getPassword());
+        if (context.getProperties() != null && !context.getProperties().isEmpty()) {
+            info.putAll(context.getProperties());
+        }
         return driver.connect(jdbcUrl, info);
     }