diff --git a/system/database/Databases/Connectors/Oracle/ORDS/Connector.php b/system/database/Databases/Connectors/Oracle/ORDS/Connector.php
index 17fee65..a6f3f79 100644
--- a/system/database/Databases/Connectors/Oracle/ORDS/Connector.php
+++ b/system/database/Databases/Connectors/Oracle/ORDS/Connector.php
@@ -44,9 +44,6 @@ class Connector {
 
 		$this->pass = $pass;
 
-		/** @var \Phacil\Framework\Databases\Connectors\Oracle\ORDS\Api\Query */
-		//$this->queryExecutor = \Phacil\Framework\Registry::getInstance()->create(\Phacil\Framework\Databases\Connectors\Oracle\ORDS\Api\Query::class);
-
 		return $this;
 	}
 
diff --git a/system/database/Databases/Connectors/Oracle/ORDS/Model/Query.php b/system/database/Databases/Connectors/Oracle/ORDS/Model/Query.php
index 95429b2..d60b9e3 100644
--- a/system/database/Databases/Connectors/Oracle/ORDS/Model/Query.php
+++ b/system/database/Databases/Connectors/Oracle/ORDS/Model/Query.php
@@ -58,15 +58,17 @@ class Query implements QueryApi {
 	private $handleFactory;
 
 	/**
-	 * @param \Phacil\Framework\Databases\Connectors\Oracle\ORDS\Connector $conector 
-	 * @param \Phacil\Framework\Databases\Connectors\Oracle\ORDS\Api\HandleInterface $handle 
+	 * 
+	 * @param \Phacil\Framework\Factory $Factory 
+	 * @param \Phacil\Framework\Databases\Connectors\Oracle\ORDS\Helper\Data $helper 
 	 * @return $this 
 	 */
 	public function __construct(
-		\Phacil\Framework\Databases\Connectors\Oracle\ORDS\Api\HandleInterfaceFactory $handle,
+		\Phacil\Framework\Factory $Factory,
 		DataHelper $helper
 	) {
-		$this->handleFactory = $handle;
+		$this->handleFactory = $Factory;
+		$this->handleFactory->setClass(HandleInterface::class);
 		$this->helper = $helper;
 
 		return $this;