diff --git a/lib/pool-factory.js b/lib/pool-factory.js
index aa7bd0b19..56d549262 100644
--- a/lib/pool-factory.js
+++ b/lib/pool-factory.js
@@ -1,14 +1,13 @@
 var Client = require('./client');
+var ConnectionParameters = require('./connection-parameters');
 var util = require('util');
 var Pool = require('pg-pool');
 
 module.exports = function(Client) {
 
   var BoundPool = function(options) {
-    var config = { Client: Client };
-    for (var key in options) {
-      config[key] = options[key];
-    }
+    var config = new ConnectionParameters(options);
+    config.Client = Client;
     Pool.call(this, config);
   };