diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index b420143..c736b9a 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -149,62 +149,7 @@ class Configuration implements ConfigurationInterface
                                 ->children()
                                     ->scalarNode('index_analyzer')->end()
                                     ->scalarNode('search_analyzer')->end()
-                                    ->arrayNode('persistence')
-                                        ->validate()
-                                            ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['listener']); })
-                                            ->thenInvalid('Propel doesn\'t support listeners')
-                                            ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['repository']); })
-                                            ->thenInvalid('Propel doesn\'t support the "repository" parameter')
-                                        ->end()
-                                        ->children()
-                                            ->scalarNode('driver')
-                                                ->validate()
-                                                    ->ifNotInArray($this->supportedDrivers)
-                                                    ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($this->supportedDrivers))
-                                                ->end()
-                                            ->end()
-                                            ->scalarNode('identifier')->defaultValue('id')->end()
-                                            ->arrayNode('provider')
-                                                ->children()
-                                                    ->scalarNode('batch_size')->defaultValue(100)->end()
-                                                    ->scalarNode('clear_object_manager')->defaultTrue()->end()
-                                                    ->scalarNode('disable_logger')->defaultValue('%kernel.debug%')->end()
-                                                    ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
-                                                    ->scalarNode('service')->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('listener')
-                                                ->children()
-                                                    ->scalarNode('insert')->defaultTrue()->end()
-                                                    ->scalarNode('update')->defaultTrue()->end()
-                                                    ->scalarNode('delete')->defaultTrue()->end()
-                                                    ->scalarNode('persist')->defaultValue('postFlush')->end()
-                                                    ->scalarNode('service')->end()
-                                                    ->variableNode('is_indexable_callback')->defaultNull()->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('finder')
-                                                ->children()
-                                                    ->scalarNode('service')->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('elastica_to_model_transformer')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('hydrate')->defaultTrue()->end()
-                                                    ->scalarNode('ignore_missing')->defaultFalse()->end()
-                                                    ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
-                                                    ->scalarNode('service')->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('model_to_elastica_transformer')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('service')->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
+                                    ->append($this->getPersistenceNode())
                                 ->end()
                             ->end()
                             ->variableNode('settings')->defaultValue(array())->end()
@@ -241,69 +186,7 @@ class Configuration implements ConfigurationInterface
                     ->end()
                     ->scalarNode('index_analyzer')->end()
                     ->scalarNode('search_analyzer')->end()
-                    ->arrayNode('persistence')
-                        ->validate()
-                            ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['listener']); })
-                            ->thenInvalid('Propel doesn\'t support listeners')
-                            ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['repository']); })
-                            ->thenInvalid('Propel doesn\'t support the "repository" parameter')
-                        ->end()
-                        ->children()
-                            ->scalarNode('driver')
-                                ->validate()
-                                    ->ifNotInArray($this->supportedDrivers)
-                                    ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($this->supportedDrivers))
-                                ->end()
-                            ->end()
-                            ->scalarNode('model')->end()
-                            ->scalarNode('repository')->end()
-                            ->scalarNode('identifier')->defaultValue('id')->end()
-                            ->arrayNode('provider')
-                                ->children()
-                                    ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
-                                    ->scalarNode('batch_size')->defaultValue(100)->end()
-                                    ->scalarNode('clear_object_manager')->defaultTrue()->end()
-                                    ->scalarNode('service')->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('listener')
-                                ->children()
-                                    ->scalarNode('insert')->defaultTrue()->end()
-                                    ->scalarNode('update')->defaultTrue()->end()
-                                    ->scalarNode('delete')->defaultTrue()->end()
-                                    ->scalarNode('flush')->defaultTrue()->end()
-                                    ->booleanNode('immediate')->defaultFalse()->end()
-                                    ->scalarNode('logger')
-                                        ->defaultFalse()
-                                        ->treatNullLike('fos_elastica.logger')
-                                        ->treatTrueLike('fos_elastica.logger')
-                                    ->end()
-                                    ->scalarNode('service')->end()
-                                    ->variableNode('is_indexable_callback')->defaultNull()->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('finder')
-                                ->children()
-                                    ->scalarNode('service')->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('elastica_to_model_transformer')
-                                ->addDefaultsIfNotSet()
-                                ->children()
-                                    ->scalarNode('hydrate')->defaultTrue()->end()
-                                    ->scalarNode('ignore_missing')->defaultFalse()->end()
-                                    ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
-                                    ->scalarNode('service')->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('model_to_elastica_transformer')
-                                ->addDefaultsIfNotSet()
-                                ->children()
-                                    ->scalarNode('service')->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
+                    ->append($this->getPersistenceNode())
                 ->end()
                 ->append($this->getIdNode())
                 ->append($this->getMappingsNode())
@@ -738,4 +621,77 @@ class Configuration implements ConfigurationInterface
 
         return $node;
     }
+
+    /**
+     * @return ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition
+     */
+    protected function getPersistenceNode()
+    {
+        $builder = new TreeBuilder();
+        $node = $builder->root('persistence');
+
+        $node
+            ->validate()
+                ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['listener']); })
+                    ->thenInvalid('Propel doesn\'t support listeners')
+                ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['repository']); })
+                    ->thenInvalid('Propel doesn\'t support the "repository" parameter')
+            ->end()
+            ->children()
+                ->scalarNode('driver')
+                    ->validate()
+                    ->ifNotInArray($this->supportedDrivers)
+                        ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($this->supportedDrivers))
+                    ->end()
+                ->end()
+                ->scalarNode('model')->end()
+                ->scalarNode('repository')->end()
+                ->scalarNode('identifier')->defaultValue('id')->end()
+                ->arrayNode('provider')
+                    ->children()
+                        ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
+                        ->scalarNode('batch_size')->defaultValue(100)->end()
+                        ->scalarNode('clear_object_manager')->defaultTrue()->end()
+                        ->scalarNode('service')->end()
+                    ->end()
+                ->end()
+                ->arrayNode('listener')
+                    ->children()
+                        ->scalarNode('insert')->defaultTrue()->end()
+                        ->scalarNode('update')->defaultTrue()->end()
+                        ->scalarNode('delete')->defaultTrue()->end()
+                        ->booleanNode('immediate')->defaultFalse()->end()
+                        ->scalarNode('logger')
+                            ->defaultFalse()
+                            ->treatNullLike('fos_elastica.logger')
+                            ->treatTrueLike('fos_elastica.logger')
+                        ->end()
+                        ->scalarNode('service')->end()
+                        ->variableNode('is_indexable_callback')->defaultNull()->end()
+                    ->end()
+                ->end()
+                ->arrayNode('finder')
+                    ->children()
+                        ->scalarNode('service')->end()
+                    ->end()
+                ->end()
+                ->arrayNode('elastica_to_model_transformer')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('hydrate')->defaultTrue()->end()
+                        ->scalarNode('ignore_missing')->defaultFalse()->end()
+                        ->scalarNode('query_builder_method')->defaultValue('createQueryBuilder')->end()
+                        ->scalarNode('service')->end()
+                    ->end()
+                ->end()
+                ->arrayNode('model_to_elastica_transformer')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('service')->end()
+                    ->end()
+                ->end()
+            ->end();
+
+        return $node;
+    }
 }