diff --git a/module/config/services.php b/module/config/services.php
index fe95276..8f23f41 100644
--- a/module/config/services.php
+++ b/module/config/services.php
@@ -11,13 +11,12 @@
 
 use Netzmacht\Contao\Leaflet\Boot;
 use Netzmacht\Contao\Leaflet\ContaoAssets;
-use Netzmacht\Contao\Leaflet\Frontend\Helper\InsertTagReplacer;
 use Netzmacht\Contao\Leaflet\Frontend\ValueFilter;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\MapService;
 use Netzmacht\Contao\Leaflet\ServiceContainer;
+use Netzmacht\Contao\Toolkit\DependencyInjection\Services;
 use Netzmacht\JavascriptBuilder\Builder;
-use Netzmacht\JavascriptBuilder\Encoder;
 use Netzmacht\JavascriptBuilder\Encoder\ChainEncoder;
 use Netzmacht\JavascriptBuilder\Encoder\JavascriptEncoder;
 use Netzmacht\JavascriptBuilder\Encoder\MultipleObjectsEncoder;
@@ -114,7 +113,7 @@ $container['leaflet.definition.builder'] = $container->share(function($container
 });
 
 $container['leaflet.frontend.value-filter'] = $container->share(function($container) {
-    return new ValueFilter($container['toolkit.insert-tag-replacer']);
+    return new ValueFilter($container[Services::INSERT_TAG_REPLACER]);
 });
 
 $container['leaflet.service-container'] = $container->share(function($container) {
diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
index 48bdd36..baed3c1 100644
--- a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
+++ b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
@@ -20,7 +20,8 @@ use Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Mapper\Mapper;
 use Netzmacht\Contao\Leaflet\Model\IconModel;
-use Netzmacht\Contao\Toolkit\Event\InitializeSystemEvent;
+use Netzmacht\Contao\Toolkit\Boot\Event\InitializeSystemEvent;
+use Netzmacht\Contao\Toolkit\DependencyInjection\Services;
 use Netzmacht\LeafletPHP\Assets;
 use Netzmacht\LeafletPHP\Definition\Type\ImageIcon;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -55,12 +56,12 @@ class BootSubscriber implements EventSubscriberInterface
      */
     public function initializeInsertTagParser(InitializeSystemEvent $event)
     {
-        $container  = $event->getServiceContainer();
-        $debugMode  = $container->getConfig()->get('debugMode');
-        $mapService = $container->getService('leaflet.map.service');
+        $container  = $event->getContainer();
+        $debugMode  = $container->get(Services::CONFIG)->get('debugMode');
+        $mapService = $container->get('leaflet.map.service');
         $parser     = new LeafletInsertTagParser($mapService, $debugMode);
 
-        $container->getInsertTagReplacer()->registerParser($parser);
+        $container->get(Services::INSERT_TAG_REPLACER)->registerParser($parser);
     }
 
     /**