diff --git a/src/Dca/Validator.php b/src/Listener/Dca/Validator.php
similarity index 87%
rename from src/Dca/Validator.php
rename to src/Listener/Dca/Validator.php
index f96a920..2fc5ef3 100644
--- a/src/Dca/Validator.php
+++ b/src/Listener/Dca/Validator.php
@@ -10,9 +10,8 @@
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet\Dca;
+namespace Netzmacht\Contao\Leaflet\Listener\Dca;
 
-use Netzmacht\Contao\Toolkit\Dca\Callback\CallbackFactory;
 use Netzmacht\LeafletPHP\Value\LatLng;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
@@ -40,18 +39,6 @@ class Validator
         $this->translator = $translator;
     }
 
-    /**
-     * Generate the callback definition.
-     *
-     * @param string $methodName Callback method name.
-     *
-     * @return callable
-     */
-    public static function callback($methodName)
-    {
-        return CallbackFactory::service('leaflet.dca.validator', $methodName);
-    }
-
     /**
      * Validate coordinates.
      *
diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml
index c689984..b717b39 100644
--- a/src/Resources/config/listeners.yml
+++ b/src/Resources/config/listeners.yml
@@ -5,6 +5,11 @@ services:
       - '@filesystem'
       - '%netzmacht.contao_leaflet_maps.cache_dir%'
 
+  netzmacht.contao_leaflet_maps.listeners.dca.validator:
+    class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator
+    arguments:
+      - '@translator'
+
   netzmacht.contao_leaflet_maps.listeners.dca.map:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener
     arguments:
diff --git a/src/Resources/contao/dca/tl_leaflet_control.php b/src/Resources/contao/dca/tl_leaflet_control.php
index a4aca37..7be201e 100644
--- a/src/Resources/contao/dca/tl_leaflet_control.php
+++ b/src/Resources/contao/dca/tl_leaflet_control.php
@@ -177,7 +177,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::PARENT_ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array(
                 'mandatory'   => false,
diff --git a/src/Resources/contao/dca/tl_leaflet_icon.php b/src/Resources/contao/dca/tl_leaflet_icon.php
index 6647127..c205c9c 100644
--- a/src/Resources/contao/dca/tl_leaflet_icon.php
+++ b/src/Resources/contao/dca/tl_leaflet_icon.php
@@ -199,7 +199,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'           => 'varchar(255) NULL'
@@ -293,7 +293,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates']
             ),
             'eval'          => array(
                 'maxlength'   => 255,
@@ -308,7 +308,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates']
             ),
             'eval'          => array(
                 'maxlength'   => 255,
@@ -323,7 +323,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates']
             ),
             'eval'          => array(
                 'maxlength'   => 255,
diff --git a/src/Resources/contao/dca/tl_leaflet_layer.php b/src/Resources/contao/dca/tl_leaflet_layer.php
index 822d0d4..670faa7 100644
--- a/src/Resources/contao/dca/tl_leaflet_layer.php
+++ b/src/Resources/contao/dca/tl_leaflet_layer.php
@@ -264,7 +264,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'sql'           => 'varchar(255) NULL',
diff --git a/src/Resources/contao/dca/tl_leaflet_map.php b/src/Resources/contao/dca/tl_leaflet_map.php
index 00f69d1..39e5f68 100644
--- a/src/Resources/contao/dca/tl_leaflet_map.php
+++ b/src/Resources/contao/dca/tl_leaflet_map.php
@@ -180,7 +180,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias']
             ),
             'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => 'varchar(255) NULL'
@@ -191,7 +191,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
             ),
             'wizard' => array(
                 ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder']
diff --git a/src/Resources/contao/dca/tl_leaflet_marker.php b/src/Resources/contao/dca/tl_leaflet_marker.php
index 7993df9..2af6606 100644
--- a/src/Resources/contao/dca/tl_leaflet_marker.php
+++ b/src/Resources/contao/dca/tl_leaflet_marker.php
@@ -181,7 +181,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'           => 'varchar(255) NULL'
@@ -192,7 +192,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
                 array('netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates')
             ),
             'load_callback' => array(
diff --git a/src/Resources/contao/dca/tl_leaflet_popup.php b/src/Resources/contao/dca/tl_leaflet_popup.php
index afee0b4..a492b15 100644
--- a/src/Resources/contao/dca/tl_leaflet_popup.php
+++ b/src/Resources/contao/dca/tl_leaflet_popup.php
@@ -171,7 +171,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'           => 'varchar(255) NULL'
@@ -236,7 +236,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates']
             ),
             'eval'          => array(
                 'maxlength'   => 255,
diff --git a/src/Resources/contao/dca/tl_leaflet_style.php b/src/Resources/contao/dca/tl_leaflet_style.php
index 36aa0a0..827f06c 100644
--- a/src/Resources/contao/dca/tl_leaflet_style.php
+++ b/src/Resources/contao/dca/tl_leaflet_style.php
@@ -165,7 +165,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'           => 'varchar(255) NULL'
diff --git a/src/Resources/contao/dca/tl_leaflet_vector.php b/src/Resources/contao/dca/tl_leaflet_vector.php
index 405af7e..ca0b799 100644
--- a/src/Resources/contao/dca/tl_leaflet_vector.php
+++ b/src/Resources/contao/dca/tl_leaflet_vector.php
@@ -209,7 +209,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
                     ['title'],
                     \Netzmacht\Contao\Leaflet\DependencyInjection\LeafletServices::ALIAS_GENERATOR
                 ),
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateAlias'),
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
             ),
             'eval'          => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'           => 'varchar(255) NULL'
@@ -319,7 +319,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates']
             ),
             'wizard'        => array(
                 ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder']
@@ -348,7 +348,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
             'search'    => false,
             'eval'      => array('mandatory' => true, 'alwaysSave' => true),
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinates')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates']
             ),
             'sql'       => 'longblob NULL'
         ),
@@ -373,7 +373,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
                 )
             ),
             'save_callback' => array(
-                \Netzmacht\Contao\Leaflet\Dca\Validator::callback('validateMultipleCoordinateSets')
+                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets']
             ),
             'sql'       => 'longblob NULL'
         ),