diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index e9088e8..11c1cf4 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -138,68 +138,9 @@ class Configuration implements ConfigurationInterface
                             ->scalarNode('client')->end()
                             ->scalarNode('finder')
                                 ->treatNullLike(true)
-                                ->defaultFalse()
-                            ->end()
-                            ->arrayNode('type_prototype')
-                                ->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('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('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()
-                                ->end()
+                                ->defaultTrue()
                             ->end()
+                            ->append($this->getTypePrototypeNode())
                             ->variableNode('settings')->defaultValue(array())->end()
                         ->end()
                         ->append($this->getTypesNode())
@@ -209,6 +150,19 @@ class Configuration implements ConfigurationInterface
         ;
     }
 
+    /**
+     * Builds a type prototype node for the index configuration.
+     */
+    protected function getTypePrototypeNode()
+    {
+        $builder = new TreeBuilder();
+        $node = $builder->root('type_prototype');
+
+        $this->applyTypeConfiguration($node);
+
+        return $node;
+    }
+
     /**
      * Returns the array node used for "types".
      */
@@ -217,92 +171,100 @@ class Configuration implements ConfigurationInterface
         $builder = new TreeBuilder();
         $node = $builder->root('types');
 
-        $node
+        $childrenNode = $node
             ->useAttributeAsKey('name')
             ->prototype('array')
-                ->treatNullLike(array())
-                ->children()
-                    ->arrayNode('serializer')
-                        ->addDefaultsIfNotSet()
-                        ->children()
-                            ->arrayNode('groups')
-                                ->treatNullLike(array())
-                                ->prototype('scalar')->end()
-                            ->end()
-                            ->scalarNode('version')->end()
+                ->treatNullLike(array());
+
+        $this->applyTypeConfiguration($childrenNode);
+
+        return $node;
+    }
+
+    /**
+     * Applies all type configuration fields to a node.
+     */
+    protected function applyTypeConfiguration($node)
+    {
+        $node
+            ->children()
+                ->arrayNode('serializer')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->arrayNode('groups')
+                            ->treatNullLike(array())
+                            ->prototype('scalar')->end()
                         ->end()
+                        ->scalarNode('version')->end()
                     ->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()
+                ->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()
-                        ->children()
-                            ->scalarNode('driver')
-                                ->validate()
-                                    ->ifNotInArray($this->supportedDrivers)
-                                    ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($this->supportedDrivers))
-                                ->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()
-                            ->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('service')->end()
+                                ->variableNode('is_indexable_callback')->defaultNull()->end()
                             ->end()
-                            ->arrayNode('listener')
-                                ->children()
-                                    ->scalarNode('insert')->defaultTrue()->end()
-                                    ->scalarNode('update')->defaultTrue()->end()
-                                    ->scalarNode('delete')->defaultTrue()->end()
-                                    ->scalarNode('service')->end()
-                                    ->variableNode('is_indexable_callback')->defaultNull()->end()
-                                ->end()
+                        ->end()
+                        ->arrayNode('finder')
+                            ->children()
+                                ->scalarNode('service')->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()
-                            ->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()
+                        ->arrayNode('model_to_elastica_transformer')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->scalarNode('service')->end()
                             ->end()
                         ->end()
                     ->end()
                 ->end()
-                ->append($this->getIdNode())
-                ->append($this->getMappingsNode())
-                ->append($this->getDynamicTemplateNode())
-                ->append($this->getSourceNode())
-                ->append($this->getBoostNode())
-                ->append($this->getRoutingNode())
-                ->append($this->getParentNode())
-                ->append($this->getAllNode())
             ->end()
-        ;
-
-        return $node;
+            ->append($this->getIdNode())
+            ->append($this->getMappingsNode())
+            ->append($this->getDynamicTemplateNode())
+            ->append($this->getSourceNode())
+            ->append($this->getBoostNode())
+            ->append($this->getRoutingNode())
+            ->append($this->getParentNode())
+            ->append($this->getAllNode());
     }
 
     /**