diff --git a/src/Containers/EsiConfiguration.php b/src/Containers/EsiConfiguration.php
index 9cdf51e..522d1fb 100644
--- a/src/Containers/EsiConfiguration.php
+++ b/src/Containers/EsiConfiguration.php
@@ -44,6 +44,9 @@ class EsiConfiguration extends AbstractArrayAccess
     protected $data = [
         'http_user_agent'            => 'Eseye Default Library',
         'datasource'                 => 'tranquility',
+        'esi_scheme'                 => 'https',
+        'esi_host'                   => 'esi.evetech.net',
+        'esi_port'                   => 443,
 
         // Fetcher
         'fetcher'                    => GuzzleFetcher::class,
diff --git a/src/Eseye.php b/src/Eseye.php
index 389a53e..68d6292 100644
--- a/src/Eseye.php
+++ b/src/Eseye.php
@@ -82,14 +82,6 @@ class Eseye
      */
     protected $request_body = [];
 
-    /**
-     * @var string
-     */
-    protected $esi = [
-        'scheme' => 'https',
-        'host'   => 'esi.evetech.net',
-    ];
-
     /**
      * @var string
      */
@@ -327,8 +319,9 @@ public function buildDataUri(string $uri, array $data): Uri
         ], $this->getQueryString());
 
         return Uri::fromParts([
-            'scheme' => $this->esi['scheme'],
-            'host'   => $this->esi['host'],
+            'scheme' => $this->getConfiguration()->esi_scheme,
+            'host'   => $this->getConfiguration()->esi_host,
+            'port'   => $this->getConfiguration()->esi_port,
             'path'   => rtrim($this->getVersion(), '/') .
                 $this->mapDataToUri($uri, $data),
             'query'  => http_build_query($query_params),