diff --git a/Form/Type/RecommenderTemplatesType.php b/Form/Type/RecommenderTemplatesType.php
index 52d1da6..79ececc 100644
--- a/Form/Type/RecommenderTemplatesType.php
+++ b/Form/Type/RecommenderTemplatesType.php
@@ -99,7 +99,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'tooltip'  => 'mautic.plugin.recommender.form.template_mode.tooltip',
                 ],
                 'choices'           => $this->getTemplateModes(),
-                'choices_as_values' => true,
                 'data'              => $options['data']->getTemplateMode() ?: 'basic',
             ]
         );
diff --git a/Service/RecommenderGenerator.php b/Service/RecommenderGenerator.php
index c905be9..023b8ec 100644
--- a/Service/RecommenderGenerator.php
+++ b/Service/RecommenderGenerator.php
@@ -44,7 +44,7 @@ class RecommenderGenerator
     /**
      * RecommenderGenerator constructor.
      */
-    public function __construct(TemplateModel $recommenderModel, RecommenderApi $recommenderApi, LeadModel $leadModel, \Twig_Environment $twig, ApiCommands $apiCommands, TemplatingHelper $templatingHelper, EventDispatcherInterface $dispatcher)
+    public function __construct(TemplateModel $recommenderModel, RecommenderApi $recommenderApi, LeadModel $leadModel, \Twig\Environment $twig, ApiCommands $apiCommands, TemplatingHelper $templatingHelper, EventDispatcherInterface $dispatcher)
     {
         $this->twig              = $twig;
         $this->templateHelper    = $templatingHelper;
diff --git a/composer.json b/composer.json
index 2e01763..9f6a717 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,10 @@
   "name": "kuzmany/mautic-recommender-bundle",
   "type": "mautic-plugin",
   "require": {
-    "mautic/composer-plugin": "^1.0",
+    "mautic/core-lib": "^4.0",
     "halaxa/json-machine": "^0.3.0"
+  },
+  "extra": {
+    "install-directory-name": "MauticRecommenderBundle"
   }
 }