diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
index 9d9362d..a8c6c56 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
@@ -56,90 +56,6 @@ abstract class AbstractMapper implements Mapper
         $this->initialize();
     }
 
-    /**
-     * Add a option mapping.
-     *
-     * @param string $option  Name of the option.
-     * @param string $mapping Mapping column name. Set if column name differs.
-     *
-     * @return $this
-     */
-    public function addOption($option, $mapping = null)
-    {
-        trigger_error(
-            __METHOD__ . ' is deprecated. Use $this->optionsBuilder->' . __FUNCTION__ . '()',
-            E_USER_DEPRECATED
-        );
-
-        $this->optionsBuilder->addOption($option, $mapping);
-
-        return $this;
-    }
-
-    /**
-     * Add options mapping.
-     *
-     * @param array|mixed $options List of option names.
-     *
-     * @return $this
-     */
-    public function addOptions($options)
-    {
-        trigger_error(
-            __METHOD__ . ' is deprecated. Use $this->optionsBuilder->' . __FUNCTION__ . '()',
-            E_USER_DEPRECATED
-        );
-
-        $arguments = func_get_args();
-
-        $this->optionsBuilder->addOptions($arguments);
-
-        return $this;
-    }
-
-    /**
-     * Add a conditional option.
-     *
-     * @param string $column  Condition column.
-     * @param string $option  Option name.
-     * @param null   $mapping Mapping column name.
-     * @param mixed  $value   Value of the conditional column.
-     *
-     * @return $this
-     */
-    public function addConditionalOption($column, $option = null, $mapping = null, $value = self::VALUE_NOT_EMPTY)
-    {
-        trigger_error(
-            __METHOD__ . ' is deprecated. Use $this->optionsBuilder->' . __FUNCTION__ . '()',
-            E_USER_DEPRECATED
-        );
-
-        $this->optionsBuilder->addConditionalOption($column, $option, $mapping, $value);
-
-        return $this;
-    }
-
-    /**
-     * Add a conditional options.
-     *
-     * @param string $column  Condition column.
-     * @param array  $options Option names.
-     * @param mixed  $value   Value of the conditional column.
-     *
-     * @return $this
-     */
-    public function addConditionalOptions($column, array $options, $value = self::VALUE_NOT_EMPTY)
-    {
-        trigger_error(
-            __METHOD__ . ' is deprecated. Use $this->optionsBuilder->' . __FUNCTION__ . '()',
-            E_USER_DEPRECATED
-        );
-
-        $this->optionsBuilder->addConditionalOptions($column, $options, $value);
-
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php
index d750e40..85b8790 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/AbstractControlMapper.php
@@ -32,6 +32,6 @@ class AbstractControlMapper extends AbstractTypeMapper
      */
     protected function initialize()
     {
-        $this->addOption('position');
+        $this->optionsBuilder->addOption('position');
     }
 }
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php
index b829f0c..ee54fe8 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/AttributionControlMapper.php
@@ -44,7 +44,7 @@ class AttributionControlMapper extends AbstractControlMapper
     {
         parent::initialize();
 
-        $this->addConditionalOption('prefix');
+        $this->optionsBuilder->addConditionalOption('prefix');
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php
index 11cdc64..5b62117 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/FullscreenControlMapper.php
@@ -41,7 +41,7 @@ class FullscreenControlMapper extends AbstractControlMapper
     {
         parent::initialize();
 
-        $this
+        $this->optionsBuilder
             ->addOption('forceSeparateButton', 'separate')
             ->addConditionalOption('title', 'title', 'buttonTitle')
             ->addOption('forcePseudoFullScreen', 'simulateFullScreen');
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
index 1d0b067..2eff321 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/LoadingControlMapper.php
@@ -59,7 +59,7 @@ class LoadingControlMapper extends AbstractControlMapper
     {
         parent::initialize();
 
-        $this->addOption('separate');
+        $this->optionsBuilder->addOption('separate');
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php
index aa7e4ff..d749db8 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/ScaleControlMapper.php
@@ -39,6 +39,6 @@ class ScaleControlMapper extends AbstractControlMapper
     {
         parent::initialize();
 
-        $this->addOptions('maxWidth', 'metric', 'imperial', 'updateWhenIdle');
+        $this->optionsBuilder->addOptions('maxWidth', 'metric', 'imperial', 'updateWhenIdle');
     }
 }
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php
index e510ece..f9c307e 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Control/ZoomControlMapper.php
@@ -39,7 +39,7 @@ class ZoomControlMapper extends AbstractControlMapper
     {
         parent::initialize();
 
-        $this
+        $this->optionsBuilder
             ->addConditionalOption('zoomInText')
             ->addConditionalOption('zoomOutText')
             ->addConditionalOption('zoomInTitle')
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php
index 938dde1..ba198f0 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/AbstractLayerMapper.php
@@ -34,6 +34,6 @@ class AbstractLayerMapper extends AbstractTypeMapper
     {
         parent::initialize();
 
-        $this->addOption('label', 'title');
+        $this->optionsBuilder->addOption('label', 'title');
     }
 }
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
index 480a529..e67c1f8 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkerClusterLayerMapper.php
@@ -16,7 +16,6 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\JavascriptBuilder\Type\AnonymousFunction;
 use Netzmacht\JavascriptBuilder\Type\Expression;
 use Netzmacht\LeafletPHP\Definition;
-use Netzmacht\LeafletPHP\Definition\HasEvents;
 use Netzmacht\LeafletPHP\Definition\Layer;
 use Netzmacht\LeafletPHP\Definition\Type\LatLngBounds;
 use Netzmacht\LeafletPHP\Plugins\MarkerCluster\MarkerClusterGroup;
@@ -50,7 +49,7 @@ class MarkerClusterLayerMapper extends AbstractLayerMapper
     {
         parent::initialize();
 
-        $this
+        $this->optionsBuilder
             ->addOptions('showCoverageOnHover', 'zoomToBoundsOnClick', 'spiderfyOnMaxZoom')
             ->addOption('removeOutsideVisibleBounds')
             ->addConditionalOption('maxClusterRadius')
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
index e7f7446..a65e38d 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/MapMapper.php
@@ -45,7 +45,7 @@ class MapMapper extends AbstractMapper
      */
     protected function initialize()
     {
-        $this
+        $this->optionsBuilder
             ->addOptions('center', 'zoom', 'zoomControl')
             ->addOptions('dragging', 'touchZoom', 'scrollWheelZoom', 'doubleClickZoom', 'boxZoom', 'tap', 'keyboard')
             ->addOptions('trackResize', 'closeOnClick', 'bounceAtZoomLimits')
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php
index 03e1245..25ec096 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Style/FixedStyleMapper.php
@@ -41,7 +41,7 @@ class FixedStyleMapper extends AbstractStyleMapper
     {
         parent::initialize();
 
-        $this
+        $this->optionsBuilder
             ->addOptions('stroke', 'weight', 'opacity', 'clickable', 'className')
             ->addConditionalOption('color')
             ->addConditionalOption('lineCap')
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php
index 373a477..3c53fde 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Type/AbstractIconMapper.php
@@ -32,6 +32,6 @@ class AbstractIconMapper extends AbstractTypeMapper
      */
     protected function initialize()
     {
-        $this->addConditionalOption('className');
+        $this->optionsBuilder->addConditionalOption('className');
     }
 }
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php
index 34ca4b3..a7a8ab8 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Type/DivIconMapper.php
@@ -44,7 +44,7 @@ class DivIconMapper extends AbstractIconMapper
     {
         parent::initialize();
 
-        $this->addOption('html');
+        $this->optionsBuilder->addOption('html');
     }
 
     /**
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php
index 0cf6804..bdf35ef 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php
@@ -60,7 +60,7 @@ class MarkerMapper extends AbstractMapper
      */
     protected function initialize()
     {
-        $this
+        $this->optionsBuilder
             ->addConditionalOption('tooltip', 'title', 'tooltip')
             ->addConditionalOption('alt')
             ->addConditionalOption('zIndexOffset')
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
index 75c08ba..4a19677 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Vector/CircleMapper.php
@@ -45,7 +45,7 @@ class CircleMapper extends AbstractVectorMapper
     {
         parent::initialize();
 
-        $this->addOption('radius');
+        $this->optionsBuilder->addOption('radius');
     }
 
     /**