diff --git a/Classes/Hooks/SaveCloseHook.php b/Classes/Provider/SaveCloseProvider.php
similarity index 76%
rename from Classes/Hooks/SaveCloseHook.php
rename to Classes/Provider/SaveCloseProvider.php
index c2c86a7..51a9a97 100644
--- a/Classes/Hooks/SaveCloseHook.php
+++ b/Classes/Provider/SaveCloseProvider.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Goran\SaveCloseCe\Hooks;
+namespace Goran\SaveCloseCe\Provider;
 
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
+use TYPO3\CMS\Backend\Template\Components\ModifyButtonBarEvent;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Localization\LanguageService;
@@ -11,26 +12,18 @@
 
 /**
  * Add an extra save and close button at the end
- *
- * Class SaveButtonHook
- * @package Goran\SaveCloseCe\Hooks
  */
-class SaveCloseHook
+class SaveCloseProvider
 {
-    /**
-     * @param array $params
-     * @param $buttonBar
-     * @return array
-     */
-    public function addSaveCloseButton($params, &$buttonBar)
+    public function __invoke(ModifyButtonBarEvent $event): void
     {
-        $buttons = $params['buttons'];
+        $buttons = $event->getButtons();
         $saveButton = $buttons[ButtonBar::BUTTON_POSITION_LEFT][2][0] ?? null;
         if ($saveButton instanceof InputButton) {
             /** @var IconFactory $iconFactory */
             $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
 
-            $saveCloseButton = $buttonBar->makeInputButton()
+            $saveCloseButton = $event->getButtonBar()->makeInputButton()
                 ->setName('_saveandclosedok')
                 ->setValue('1')
                 ->setForm($saveButton->getForm())
@@ -40,7 +33,7 @@ public function addSaveCloseButton($params, &$buttonBar)
 
             $buttons[ButtonBar::BUTTON_POSITION_LEFT][2][] = $saveCloseButton;
         }
-        return $buttons;
+        $event->setButtons($buttons);
     }
 
     /**
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..3910cdb
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,12 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Goran\SaveCloseCe\:
+    resource: '../Classes/*'
+  Goran\SaveCloseCe\Provider\SaveCloseProvider:
+    tags:
+      - name: event.listener
+        identifier: 'save-close-to-button-bar'
diff --git a/composer.json b/composer.json
index 65e5780..dc4e922 100644
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,8 @@
 		}
 	},
 	"require": {
-		"php": "^7. || ^8.0",
-		"typo3/cms-core": "^9.5 || ^10.2 || ^11.0"
+		"php": "^7.4 || ^8.0 || ^8.1",
+		"typo3/cms-core": "^11.0 || 12.0^"
 	},
 	"extra": {
 		"typo3/cms": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 7fbac96..ba5e0a8 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -19,7 +19,7 @@
         [
             'depends' =>
                 [
-                    'typo3' => '9.5.0-11.5.99',
+                    'typo3' => '11.5.0-12.4.99',
                 ],
             'conflicts' =>
                 [],
diff --git a/ext_tables.php b/ext_tables.php
index 5fe88f1..de3ff1e 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -1,6 +1,4 @@
 <?php
-if (!defined('TYPO3_MODE')) {
+if (!defined('TYPO3')) {
     die('Access denied.');
 }
-
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['Backend\Template\Components\ButtonBar']['getButtonsHook'][] = 'Goran\SaveCloseCe\Hooks\SaveCloseHook->addSaveCloseButton';