diff --git a/Classes/Controller/IframeController.php b/Classes/Controller/IframeController.php
index e64fabd..c4781ae 100644
--- a/Classes/Controller/IframeController.php
+++ b/Classes/Controller/IframeController.php
@@ -7,7 +7,7 @@ class IframeController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 {
     protected $iframeEmbedUrl = 'https://map.geo.admin.ch/embed.html';
 
-    public function indexAction()
+    public function indexAction(): void
     {
         $tsfe = $this->getTsfe();
 
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index e137f3f..9c23417 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,17 +1,16 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-$extensionKey = 'mapgeoadmin';
-$pluginName = 'Embed';
+(static function ($extensionKey) {
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'Saccas.' . $extensionKey,
+        'Embed',
+        'Map geo admin / iframe',
+        'EXT:mapgeoadmin/Resources/Public/Icons/Extension.png'
+    );
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'Saccas.' . $extensionKey,
-    $pluginName,
-    'Map geo admin / iframe',
-    'EXT:mapgeoadmin/Resources/Public/Icons/Extension.png'
-);
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist'][$extensionKey . '_embed'] = 'recursive,select_key,pages';
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['mapgeoadmin_embed'] = 'recursive,select_key,pages';
-
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['mapgeoadmin_embed'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('mapgeoadmin_embed', 'FILE:EXT:mapgeoadmin/Configuration/FlexForms/MapgeoadminIframe.xml');
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$extensionKey . '_embed'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($extensionKey . '_embed', 'FILE:EXT:' . $extensionKey . '/Configuration/FlexForms/MapgeoadminIframe.xml');
+})('mapgeoadmin');
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 48cd6cc..f10e055 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,10 @@
     },
     "require": {
         "php": "^7.2",
-	"typo3/cms-core": "^8.7.13 || ^9.5.0"
+        "typo3/cms-core": "^8.7.13 || ^9.5.0 || ^10.4.10"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.2.0",
-        "typo3/cms": "^8.7.0",
         "typo3/testing-framework": "^1.2.2"
     },
     "scripts": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 08ce68a..370e48e 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -5,7 +5,7 @@
     'description' => 'Map geo admin iframe integration',
     'category' => 'misc',
     'shy' => 0,
-    'version' => '2.0.0',
+    'version' => '2.0.1',
     'state' => 'stable',
     'clearCacheOnLoad' => 1,
     'author' => '',
@@ -17,7 +17,7 @@
         ],
     'constraints' => [
         'depends' => [
-            'typo3' => '8.7.13-9.5.99',
+            'typo3' => '8.7.13-10.9.99',
         ],
         'conflicts' => [
         ],
diff --git a/ext_localconf.php b/ext_localconf.php
index 72f32bc..0f7f2f2 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,14 +1,14 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-(function ($extkey) {
+(static function () {
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-        'Saccas.' . $extkey,
+        'Mapgeoadmin',
         'Embed',
         [
-            'Iframe' => 'index',
+            \Saccas\Mapgeoadmin\Controller\IframeController::class => 'index',
         ],
         [
         ]
     );
-})('mapgeoadmin');
\ No newline at end of file
+})();