diff --git a/assets/config.php b/assets/config.php
index 46b4c6e1..1ec13a91 100644
--- a/assets/config.php
+++ b/assets/config.php
@@ -231,9 +231,6 @@ return [
         // Stancl\Tenancy\Features\TelescopeTags::class, // https://tenancy.samuelstancl.me/docs/v2/telescope/
         // Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancy.samuelstancl.me/docs/v2/features/tenant-redirect/
     ],
-    'storage_to_config_map' => [ // Used by the TenantConfig feature
-        // 'paypal_api_key' => 'services.paypal.api_key',
-    ],
 
     /**
      * The URL to which users will be redirected when they try to acceess a central route on a tenant domain.
diff --git a/src/Features/TenantConfig.php b/src/Features/TenantConfig.php
index 9c3d8206..a8f45150 100644
--- a/src/Features/TenantConfig.php
+++ b/src/Features/TenantConfig.php
@@ -17,6 +17,10 @@ class TenantConfig implements Feature
     /** @var array */
     public $originalConfig = [];
 
+    public static $storageToConfigMap = [
+        // 'paypal_api_key' => 'services.paypal.api_key',
+    ];
+
     public function __construct(Repository $config)
     {
         $this->config = $config;
@@ -56,6 +60,6 @@ class TenantConfig implements Feature
 
     public function getStorageToConfigMap(): array
     {
-        return $this->config['tenancy.storage_to_config_map'] ?? [];
+        return static::$storageToConfigMap;
     }
 }
diff --git a/src/Features/Timestamps.php b/src/Features/Timestamps.php
index 309631ed..63dc9c85 100644
--- a/src/Features/Timestamps.php
+++ b/src/Features/Timestamps.php
@@ -15,6 +15,8 @@ class Timestamps implements Feature
     /** @var Repository */
     protected $config;
 
+    public static $format = 'c'; // ISO 8601
+
     public function __construct(Repository $config)
     {
         $this->config = $config;
@@ -38,9 +40,6 @@ class Timestamps implements Feature
 
     public function now(): string
     {
-        // Add this key to your tenancy.php config if you need to change the format.
-        return Date::now()->format(
-            $this->config->get('tenancy.timestamp_format') ?? 'c' // ISO 8601
-        );
+        return Date::now()->format(static::$format);
     }
 }
diff --git a/tests/Features/TenantConfigTest.php b/tests/Features/TenantConfigTest.php
index db8fcaf3..d6594f98 100644
--- a/tests/Features/TenantConfigTest.php
+++ b/tests/Features/TenantConfigTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Tests\Features;
 
+use Stancl\Tenancy\Features\TenantConfig;
 use Stancl\Tenancy\Tests\TestCase;
 
 class TenantConfigTest extends TestCase
@@ -16,12 +17,12 @@ class TenantConfigTest extends TestCase
     {
         $this->assertSame(null, config('services.paypal'));
         config([
-            'tenancy.storage_to_config_map' => [
-                'paypal_api_public' => 'services.paypal.public',
-                'paypal_api_private' => 'services.paypal.private',
-            ],
-            'tenancy.features' => ['Stancl\Tenancy\Features\TenantConfig'],
+            'tenancy.features' => [TenantConfig::class],
         ]);
+        TenantConfig::$storageToConfigMap = [
+            'paypal_api_public' => 'services.paypal.public',
+            'paypal_api_private' => 'services.paypal.private',
+        ];
 
         tenancy()->create('foo.localhost', [
             'paypal_api_public' => 'foo',