diff --git a/ApplicationAbstract.php b/ApplicationAbstract.php
index 5bddb2f24..9bbc6d540 100644
--- a/ApplicationAbstract.php
+++ b/ApplicationAbstract.php
@@ -50,6 +50,14 @@ class ApplicationAbstract
      */
     protected $appName = '';
 
+    /**
+     * Organization id.
+     *
+     * @var int
+     * @since 1.0.0
+     */
+    protected $orgId = 1;
+
     /**
      * Database object.
      *
diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index aa6fe6436..95559b68f 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace phpOMS\DataStorage\Database;
 
-use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
+use phpOMS\DataStorage\DataStorageConnectionInterface;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\DataMapperInterface;
 use phpOMS\Message\RequestAbstract;
@@ -37,7 +37,7 @@ class DataMapperAbstract implements DataMapperInterface
     /**
      * Database connection.
      *
-     * @var ConnectionAbstract
+     * @var DataStorageConnectionInterface
      * @since 1.0.0
      */
     protected static $db = null;
@@ -195,13 +195,13 @@ class DataMapperAbstract implements DataMapperInterface
     /**
      * Set database connection.
      *
-     * @param ConnectionAbstract $con Database connection
+     * @param DataStorageConnectionInterface $con Database connection
      *
      * @return void
      *
      * @since  1.0.0
      */
-    public static function setConnection(ConnectionAbstract $con) : void
+    public static function setConnection(DataStorageConnectionInterface $con) : void
     {
         self::$db = $con;
     }