diff --git a/.travis.yml b/.travis.yml
index 52c13be..53b0c13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,13 @@ php:
   - 5.5
   - 5.6
   - 7
-  - hhvm
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 branches:
   only:
-    - "8.x-1.x"
+    - "8.x-2.x"
 
 env:
   global:
@@ -58,15 +55,15 @@ env:
 
     # === Behat specific variables.
     # This is relative to $TRAVIS_BUILD_DIR
-    - DRUPAL_TI_BEHAT_DIR="./tests/behat"
+    # - DRUPAL_TI_BEHAT_DIR="./tests/behat"
     # These arguments are passed to the bin/behat command.
-    - DRUPAL_TI_BEHAT_ARGS=""
+    # - DRUPAL_TI_BEHAT_ARGS=""
     # Specify the filename of the behat.yml with the $DRUPAL_TI_DRUPAL_DIR variables.
-    - DRUPAL_TI_BEHAT_YML="behat.yml.dist"
+    # - DRUPAL_TI_BEHAT_YML="behat.yml.dist"
     # This is used to setup Xvfb.
-    - DRUPAL_TI_BEHAT_SCREENSIZE_COLOR="1280x1024x16"
+    # - DRUPAL_TI_BEHAT_SCREENSIZE_COLOR="1280x1024x16"
     # The version of seleniumthat should be used.
-    - DRUPAL_TI_BEHAT_SELENIUM_VERSION="2.44"
+    # - DRUPAL_TI_BEHAT_SELENIUM_VERSION="2.44"
 
     # PHPUnit specific commandline arguments.
     - DRUPAL_TI_PHPUNIT_ARGS=""
@@ -85,9 +82,10 @@ env:
   matrix:
     # [[[ SELECT ANY OR MORE OPTIONS ]]]
     #- DRUPAL_TI_RUNNERS="phpunit"
-    - DRUPAL_TI_RUNNERS="simpletest"
+    #- DRUPAL_TI_RUNNERS="simpletest"
     #- DRUPAL_TI_RUNNERS="behat"
     #- DRUPAL_TI_RUNNERS="phpunit simpletest behat"
+    - DRUPAL_TI_RUNNERS="phpunit-core"
 
 mysql:
   database: drupal_travis_db
@@ -99,19 +97,20 @@ before_install:
   - composer global require "lionsad/drupal_ti:1.*"
   - drupal-ti before_install
   # Codesniffer and Coder
-  - composer global require "squizlabs/php_codesniffer:2.0.*@dev"
-  - composer global require drupal/coder:8.2.0-beta1
+  - composer global require squizlabs/php_codesniffer
+  - composer global require drupal/coder
   - ln -s ~/.composer/vendor/drupal/coder/coder_sniffer/Drupal ~/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/
 
 install:
   - drupal-ti install
 
 before_script:
+  - drupal-ti --include drupal_ti/.travis-before_script.sh
   - drupal-ti before_script
 
 script:
-  - drupal-ti --include .travis-phpcs.sh
-  - drupal-ti script
+  - drupal-ti --include drupal_ti/.travis-phpcs.sh
+  - export SIMPLETEST_DB=mysql://root:@127.0.0.1/drupal_travis_db; drupal-ti script
 
 after_script:
   - drupal-ti after_script
diff --git a/README.md b/README.md
index fe74f2f..f88b645 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Form Mode Manager [![Build Status](https://travis-ci.org/woprrr/form_mode_manager.svg?branch=8.x-1.x)](https://travis-ci.org/woprrr/form_mode_manager) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/woprrr/form_mode_manager/badges/quality-score.png?b=8.x-1.x)](https://scrutinizer-ci.com/g/woprrr/form_mode_manager/?branch=8.x-1.x) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/938b7347-7b09-42e2-8da9-56ad8df1432f/mini.png)](https://insight.sensiolabs.com/projects/938b7347-7b09-42e2-8da9-56ad8df1432f) [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/Form-mode-manager)
+# Form Mode Manager [![Build Status](https://travis-ci.org/woprrr/form_mode_manager.svg?branch=8.x-1.x)](https://travis-ci.org/woprrr/form_mode_manager) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/woprrr/form_mode_manager/badges/quality-score.png?b=8.x-2.x)](https://scrutinizer-ci.com/g/woprrr/form_mode_manager/?branch=8.x-1.x) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/938b7347-7b09-42e2-8da9-56ad8df1432f/mini.png)](https://insight.sensiolabs.com/projects/938b7347-7b09-42e2-8da9-56ad8df1432f) [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/Form-mode-manager)
 
 Provides an interface that allows the implementation and use of Form modes 
 easily without specific development. This module provides different
diff --git a/composer.json b/composer.json
index 7af49a0..833abd6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "drupal/form_mode_manager",
-  "description": "Allow use of form mode in all Content entities",
+  "description": "Provide an API to use Form modes",
   "type": "drupal-module",
   "homepage": "https://www.drupal.org/project/image_widget_crop",
   "keywords": ["Drupal", "Drupal Display modes", "Form modes", "Field Ui"],
diff --git a/drupal_ti/.travis-before_script.sh b/drupal_ti/.travis-before_script.sh
new file mode 100644
index 0000000..ee52d0b
--- /dev/null
+++ b/drupal_ti/.travis-before_script.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Add an optional statement to see that this is running in Travis CI.
+echo "running drupal_ti/before/before_script.sh"
+
+set -e $DRUPAL_TI_DEBUG
+
+# Ensure the right Drupal version is installed.
+# The first time this is run, it will install Drupal.
+# Note: This function is re-entrant.
+drupal_ti_ensure_drupal
+
+# Change to the Drupal directory
+cd "$DRUPAL_TI_DRUPAL_DIR"
diff --git a/.travis-phpcs.sh b/drupal_ti/.travis-phpcs.sh
old mode 100644
new mode 100755
similarity index 55%
rename from .travis-phpcs.sh
rename to drupal_ti/.travis-phpcs.sh
index c748e6a..8803b3b
--- a/.travis-phpcs.sh
+++ b/drupal_ti/.travis-phpcs.sh
@@ -6,4 +6,4 @@ set -e $DRUPAL_TI_DEBUG
 # Note: This function is re-entrant.
 drupal_ti_ensure_drupal
 
-phpcs --report=full --standard=Drupal "$DRUPAL_TI_DRUPAL_DIR/modules/$DRUPAL_TI_MODULE_NAME" || true
\ No newline at end of file
+phpcs --report=full --standard=Drupal "$DRUPAL_TI_DRUPAL_DIR/$DRUPAL_TI_MODULES_PATH/$DRUPAL_TI_MODULE_NAME" || true
diff --git a/form_mode_manager.info.yml b/form_mode_manager.info.yml
index 75e5760..89a6ab7 100644
--- a/form_mode_manager.info.yml
+++ b/form_mode_manager.info.yml
@@ -1,7 +1,8 @@
 name: Form Mode Manager
-description: 'Allow use of form mode in all entities'
+description: 'Provide an API to use Form modes.'
 type: module
 core: 8.x
+package : Fields
 configure: form_mode_manager.admin_settings
 dependencies:
   - drupal:field
diff --git a/form_mode_manager.links.action.yml b/form_mode_manager.links.action.yml
index b444045..fcc03ab 100644
--- a/form_mode_manager.links.action.yml
+++ b/form_mode_manager.links.action.yml
@@ -1,3 +1,4 @@
+# Form Mode Manager derives action links.
 form_mode_manager.action:
   class: \Drupal\Core\Menu\LocalActionDefault
   deriver: \Drupal\form_mode_manager\Plugin\Derivative\FormModeManagerLocalAction
diff --git a/form_mode_manager.links.task.yml b/form_mode_manager.links.task.yml
index f6441b5..d493853 100644
--- a/form_mode_manager.links.task.yml
+++ b/form_mode_manager.links.task.yml
@@ -1,14 +1,16 @@
-# Deriver to generation of task.
+# Form Mode Manager derives tasks.
 form_mode_manager.entities:
   deriver: 'Drupal\form_mode_manager\Plugin\Derivative\FormModeManagerLocalTasks'
   weight: 9
 
-# Settings Links task.
+# Admin UI - Settings links.
 form_mode_manager.admin_settings:
   title: 'Settings'
   route_name: form_mode_manager.admin_settings
   base_route: form_mode_manager.admin_settings
   weight: 0
+
+# Admin UI - Local tasks
 form_mode_manager.admin_settings_links_task:
   title: 'Local task settings'
   route_name: form_mode_manager.admin_settings_links_task
diff --git a/form_mode_manager.routing.yml b/form_mode_manager.routing.yml
index a3e90a9..c18f8a9 100644
--- a/form_mode_manager.routing.yml
+++ b/form_mode_manager.routing.yml
@@ -1,3 +1,4 @@
+# Form Mode Manager UI routes
 form_mode_manager.admin_settings:
   path: '/admin/config/content/form_mode_manager'
   defaults:
diff --git a/form_mode_manager.services.yml b/form_mode_manager.services.yml
index ed87bc5..ac285e8 100644
--- a/form_mode_manager.services.yml
+++ b/form_mode_manager.services.yml
@@ -1,17 +1,22 @@
 services:
+  # Form Mode Manager.
+  form_mode.manager:
+    class: Drupal\form_mode_manager\FormModeManager
+    arguments: ['@entity_type.manager', '@config.factory', '@entity_display.repository', '@entity_type.bundle.info', '@plugin.manager.entity_routing_map']
+
+  # Route Subscribers.
   form_mode_manager.route_subscriber:
     class: Drupal\form_mode_manager\Routing\EventSubscriber\FormModesSubscriber
     arguments: ['@entity_type.manager', '@entity_display.repository', '@form_mode.manager', '@plugin.manager.entity_routing_map']
     tags:
       - { name: event_subscriber }
   form_mode_manager.default_routes_subscriber:
-    class: Drupal\form_mode_manager\Routing\EventSubscriber\DefaultRouteSubscriber
+    class: Drupal\form_mode_manager\Routing\EventSubscriber\EnhanceEntityRouteSubscriber
     arguments: ['@entity_type.manager', '@form_mode.manager', '@plugin.manager.entity_routing_map']
     tags:
       - { name: event_subscriber }
-  form_mode.manager:
-    class: Drupal\form_mode_manager\FormModeManager
-    arguments: ['@entity_type.manager', '@config.factory', '@entity_display.repository', '@entity_type.bundle.info', '@plugin.manager.entity_routing_map']
+
+  # Entity Routing Map plugin.
   plugin.manager.entity_routing_map:
     class: Drupal\form_mode_manager\EntityRoutingMapManager
     parent: default_plugin_manager
diff --git a/modules/form_mode_manager_examples/form_mode_manager_examples.install b/modules/form_mode_manager_examples/form_mode_manager_examples.install
index 26cdd99..59958d2 100644
--- a/modules/form_mode_manager_examples/form_mode_manager_examples.install
+++ b/modules/form_mode_manager_examples/form_mode_manager_examples.install
@@ -14,14 +14,4 @@ function form_mode_manager_examples_install() {
     ->getEditable('system.site')
     ->set('page.front', '/form_mode_manager_examples')
     ->save();
-
-  // Tell Drupal you have enhance all compatibles entity_types.
-  /* @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface $invalidator */
-  $invalidator = \Drupal::service('cache_tags.invalidator');
-  $invalidator->invalidateTags([
-    'local_action',
-    'local_tasks',
-    'entity_types',
-    'rendered',
-  ]);
 }
diff --git a/modules/form_mode_manager_examples/form_mode_manager_examples.routing.yml b/modules/form_mode_manager_examples/form_mode_manager_examples.routing.yml
index 7b9e9d1..b763b62 100644
--- a/modules/form_mode_manager_examples/form_mode_manager_examples.routing.yml
+++ b/modules/form_mode_manager_examples/form_mode_manager_examples.routing.yml
@@ -2,6 +2,6 @@ form_mode_manager_examples.front_page:
   path: '/form_mode_manager_examples'
   defaults:
     _controller: '\Drupal\form_mode_manager_examples\Controller\FrontPage::content'
-    _title: 'Form Mode Manager examples '
+    _title: 'Form Mode Manager examples'
   requirements:
     _permission: 'access content'
diff --git a/modules/form_mode_manager_examples/src/Tests/FormModeManagerExamplesTest.php b/modules/form_mode_manager_examples/src/Tests/FormModeManagerExamplesTest.php
index 742fca0..c3d067d 100644
--- a/modules/form_mode_manager_examples/src/Tests/FormModeManagerExamplesTest.php
+++ b/modules/form_mode_manager_examples/src/Tests/FormModeManagerExamplesTest.php
@@ -24,6 +24,9 @@ class FormModeManagerExamplesTest extends BrowserTestBase {
     'node',
     'block',
     'block_content',
+    'media',
+    'taxonomy',
+    'form_mode_manager',
   ];
 
   /**
@@ -47,6 +50,8 @@ class FormModeManagerExamplesTest extends BrowserTestBase {
    */
   public function testInstalled() {
     $this->drupalGet('');
+    $this->assertSession()->statusCodeEquals(200);
+
     $this->assertSession()->titleEquals('Form Mode Manager examples | Drupal');
     $this->assertSession()->pageTextContains('Form Mode Manager examples');
     $this->assertSession()->pageTextContains('Welcome to Form Mode Manager example.');
diff --git a/src/AbstractEntityFormModesFactory.php b/src/AbstractEntityFormModesFactory.php
index 13b4764..3d5742a 100644
--- a/src/AbstractEntityFormModesFactory.php
+++ b/src/AbstractEntityFormModesFactory.php
@@ -178,7 +178,9 @@ abstract class AbstractEntityFormModesFactory implements EntityFormModeManagerIn
 
   /**
    * {@inheritdoc}
+   *
    * @return string
+   *   The bundle entity type id or entity type id of entity.
    */
   public function getBundleEntityTypeId(EntityInterface $entity, RouteMatchInterface $route_match) {
     $route = $route_match->getRouteObject();
@@ -195,7 +197,6 @@ abstract class AbstractEntityFormModesFactory implements EntityFormModeManagerIn
    * {@inheritdoc}
    */
   public function entityAdd(RouteMatchInterface $route_match) {
-    //
     $entity = $this->getEntity($route_match);
     $operation = $this->getOperation($route_match, $entity->getEntityTypeId());
 
diff --git a/src/EntityRoutingMapBase.php b/src/EntityRoutingMapBase.php
index cc211c6..734cfff 100644
--- a/src/EntityRoutingMapBase.php
+++ b/src/EntityRoutingMapBase.php
@@ -11,7 +11,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
  * Base class for form mode manager entity routing plugin.
  *
  * This plugin are used to abstract the concepts implemented by EntityPlugin.
- * In Entity API we have possibilitity to linked entity form 'handlers' to a,
+ * In Entity API we have possibility to linked entity form 'handlers' to a,
  * specific FormClass, but the operation name and routes linked with her are,
  * very arbitrary and unpredictable specially in custom entities cases.
  * In that plugin you have the possibility to map operation and,
@@ -19,6 +19,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
  * retrieving each possible cases.
  */
 abstract class EntityRoutingMapBase extends PluginBase implements EntityRoutingMapInterface, ContainerFactoryPluginInterface {
+
   use StringTranslationTrait;
 
   /**
@@ -50,6 +51,13 @@ abstract class EntityRoutingMapBase extends PluginBase implements EntityRoutingM
   protected $targetEntityType;
 
   /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
    * Constructs display plugin.
    *
    * @param array $configuration
@@ -61,10 +69,10 @@ abstract class EntityRoutingMapBase extends PluginBase implements EntityRoutingM
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->setTargetEntityType();
     $this->setConfiguration($configuration);
     $this->setDefaultFormClass();
     $this->setEditFormClass();
-    $this->setTargetEntityType();
   }
 
   /**
@@ -151,7 +159,27 @@ abstract class EntityRoutingMapBase extends PluginBase implements EntityRoutingM
    * {@inheritdoc}
    */
   public function setEditFormClass() {
-    $this->editFormClass = $this->pluginDefinition['editFormClass'];
+    $edit_form_operation = $this->pluginDefinition['editFormClass'];
+
+    if (!$this->entityFormClassExist($edit_form_operation)) {
+      $edit_form_operation = $this->getDefaultFormClass();
+    }
+
+    $this->editFormClass = $edit_form_operation;
+  }
+
+  /**
+   * Check if the entity have an edit operation handler.
+   *
+   * @param string $operation_name
+   *   The name of form handler operation.
+   *
+   * @return bool
+   *   True if generic `edit` form handler exist for this entity.
+   */
+  public function entityFormClassExist($operation_name) {
+    $entity_definition = \Drupal::entityTypeManager()->getDefinition($this->getTargetEntityType());
+    return !empty($entity_definition->getFormClass($operation_name));
   }
 
   /**
diff --git a/src/Routing/EventSubscriber/DefaultRouteSubscriber.php b/src/Routing/EventSubscriber/DefaultRouteSubscriber.php
deleted file mode 100644
index 69c8b80..0000000
--- a/src/Routing/EventSubscriber/DefaultRouteSubscriber.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-namespace Drupal\form_mode_manager\Routing\EventSubscriber;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Drupal\form_mode_manager\FormModeManagerInterface;
-use Drupal\form_mode_manager\EntityRoutingMapManager;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Subscriber for form_mode_manager routes.
- */
-class DefaultRouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity display repository.
-   *
-   * @var \Drupal\form_mode_manager\FormModeManagerInterface
-   */
-  protected $formModeManager;
-
-  /**
-   * The Routes Manager Plugin.
-   *
-   * @var \Drupal\form_mode_manager\EntityRoutingMapManager
-   */
-  protected $entityRoutingMap;
-
-  /**
-   * Constructs a new RouteSubscriber object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity type manager.
-   * @param \Drupal\form_mode_manager\FormModeManagerInterface $form_mode_manager
-   *   The form mode manager.
-   * @param \Drupal\form_mode_manager\EntityRoutingMapManager $plugin_routes_manager
-   *   Plugin EntityRoutingMap to retrieve entity form operation routes.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_manager, FormModeManagerInterface $form_mode_manager, EntityRoutingMapManager $plugin_routes_manager) {
-    $this->entityTypeManager = $entity_manager;
-    $this->formModeManager = $form_mode_manager;
-    $this->entityRoutingMap = $plugin_routes_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterRoutes(RouteCollection $collection) {
-    $form_modes_definitions = $this->formModeManager->getAllFormModesDefinitions();
-    foreach (array_keys($form_modes_definitions) as $entity_type_id) {
-      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-      $this->enhanceDefaultRoutes($collection, $entity_type->id());
-    }
-  }
-
-  /**
-   * Enhance existing entity operation routes (add_page, add_form, edit_form).
-   *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   */
-  protected function enhanceDefaultRoutes(RouteCollection $collection, $entity_type_id) {
-    $this->enhanceDefaultAddPageRoutes($collection, $entity_type_id);
-    $this->enhanceDefaultAddRoutes($collection, $entity_type_id);
-    $this->enhanceDefaultEditRoutes($collection, $entity_type_id);
-  }
-
-  /**
-   * Enhance entity operation routes add_page.
-   *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   */
-  protected function enhanceDefaultAddPageRoutes(RouteCollection $collection, $entity_type_id) {
-    $entity_add_page = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id])->getOperation('add_page');
-    if ($entity_add_page && $route = $collection->get($entity_add_page)) {
-      $collection->add($entity_add_page, $this->routeEnhancer($route, $entity_type_id));
-    }
-  }
-
-  /**
-   * Enhance entity operation routes add.
-   *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   */
-  protected function enhanceDefaultAddRoutes(RouteCollection $collection, $entity_type_id) {
-    $entity_route_name = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id])->getOperation('add_form');
-    if ($route = $collection->get($entity_route_name)) {
-      $collection->add($entity_route_name, $this->routeEnhancer($route, $entity_type_id));
-    }
-  }
-
-  /**
-   * Enhance entity operation routes edit.
-   *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   */
-  protected function enhanceDefaultEditRoutes(RouteCollection $collection, $entity_type_id) {
-    $entity_route_name = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id])->getOperation('edit_form');
-    if ($route = $collection->get($entity_route_name)) {
-      $collection->add($entity_route_name, $this->routeEnhancer($route, $entity_type_id));
-    }
-  }
-
-  /**
-   * Add required parameters on route basis.
-   *
-   * @param \Symfony\Component\Routing\Route $route
-   *   The route object of entity.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   *
-   * @return \Symfony\Component\Routing\Route
-   *   The route enhanced.
-   */
-  public function routeEnhancer(Route $route, $entity_type_id) {
-    $route->setRequirement('_permission', "use $entity_type_id.default form mode");
-    return $route;
-  }
-
-}
diff --git a/src/Routing/EventSubscriber/EnhanceEntityRouteSubscriber.php b/src/Routing/EventSubscriber/EnhanceEntityRouteSubscriber.php
new file mode 100644
index 0000000..fb30654
--- /dev/null
+++ b/src/Routing/EventSubscriber/EnhanceEntityRouteSubscriber.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Drupal\form_mode_manager\Routing\EventSubscriber;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Drupal\form_mode_manager\FormModeManagerInterface;
+use Drupal\form_mode_manager\EntityRoutingMapManager;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Listens to the dynamic route event and enhance existing routes.
+ *
+ * To provide a more flexible system as possible we need to add some,
+ * parameters dynamically onto each entities using form modes to,
+ * applies our logic. In the current case Form Mode Manager provide,
+ * ability to add more access granularity to `Default` entity routes.
+ */
+class EnhanceEntityRouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * The entity type definitions.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
+  protected $entityDefinition;
+
+  /**
+   * The Routes Manager Plugin.
+   *
+   * @var \Drupal\form_mode_manager\EntityRoutingMapBase
+   */
+  protected $entityRoutingDefinition;
+
+  /**
+   * The Routes Manager Plugin.
+   *
+   * @var \Drupal\form_mode_manager\EntityRoutingMapManager
+   */
+  protected $entityRoutingMap;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity display repository.
+   *
+   * @var \Drupal\form_mode_manager\FormModeManagerInterface
+   */
+  protected $formModeManager;
+
+  /**
+   * The route collection to add routes.
+   *
+   * @var \Symfony\Component\Routing\RouteCollection
+   */
+  protected $routeCollection;
+
+  /**
+   * Constructs a new RouteSubscriber object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
+   *   The entity type manager.
+   * @param \Drupal\form_mode_manager\FormModeManagerInterface $form_mode_manager
+   *   The form mode manager.
+   * @param \Drupal\form_mode_manager\EntityRoutingMapManager $plugin_routes_manager
+   *   Plugin EntityRoutingMap to retrieve entity form operation routes.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_manager, FormModeManagerInterface $form_mode_manager, EntityRoutingMapManager $plugin_routes_manager) {
+    $this->entityTypeManager = $entity_manager;
+    $this->formModeManager = $form_mode_manager;
+    $this->entityRoutingMap = $plugin_routes_manager;
+  }
+
+  /**
+   * Add form mode manager requirements to add more access granularity.
+   *
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    $entity_type_ids = array_keys($this->formModeManager->getAllFormModesDefinitions());
+    $this->routeCollection = $collection;
+    foreach ($entity_type_ids as $entity_type_id) {
+      $this->entityDefinition = $this->entityTypeManager->getDefinition($entity_type_id);
+      $this->entityRoutingDefinition = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id]);
+      $this->enhanceDefaultEntityRoute('add_form');
+      $this->enhanceDefaultEntityRoute('edit_form');
+
+      // This operation doesn't exist for unbundled entities.
+      if (!empty($this->entityDefinition->getKey('bundle'))) {
+        $this->enhanceDefaultEntityRoute('add_page');
+      }
+    }
+  }
+
+  /**
+   * Enhance existing route for given operation name.
+   *
+   * @param string $operation_name
+   *   The entity operation name.
+   */
+  public function enhanceDefaultEntityRoute($operation_name) {
+    $entity_add_page = $this->entityRoutingDefinition->getOperation($operation_name);
+    if ($entity_add_page && $route = $this->routeCollection->get($entity_add_page)) {
+      $route->setRequirement('_permission', "use {$this->entityDefinition->id()}.default form mode");
+      $this->routeCollection->add($entity_add_page, $route);
+    }
+  }
+
+}
diff --git a/src/Routing/EventSubscriber/FormModesSubscriber.php b/src/Routing/EventSubscriber/FormModesSubscriber.php
index e236ade..5f3990a 100644
--- a/src/Routing/EventSubscriber/FormModesSubscriber.php
+++ b/src/Routing/EventSubscriber/FormModesSubscriber.php
@@ -3,7 +3,6 @@
 namespace Drupal\form_mode_manager\Routing\EventSubscriber;
 
 use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\RouteSubscriberBase;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -13,32 +12,32 @@ use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
- * Subscriber for form_mode_manager routes.
+ * Listens to the dynamic route event and add routes using form modes.
  */
 class FormModesSubscriber extends RouteSubscriberBase {
 
   use StringTranslationTrait;
 
   /**
-   * The Regex pattern to contextualize process by route path.
+   * Namespace of transverse entity controller.
    *
    * @var string
    */
-  const ROUTE_PATH_CONTEXT_REGEX = '/^.*?\/edit[^$]*/';
+  const FORM_MODE_DEFAULT_CONTROLLER = '\Drupal\form_mode_manager\Controller\FormModeManagerEntityController';
 
   /**
    * The Regex pattern to contextualize process by route path.
    *
    * @var string
    */
-  const FORM_MODE_DEFAULT_CONTROLLER = '\Drupal\form_mode_manager\Controller\FormModeManagerEntityController';
+  const ROUTE_PATH_CONTEXT_REGEX = '/^.*?\/edit[^$]*/';
 
   /**
-   * The entity type manager service.
+   * The entity type plugin definition.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeInterface
    */
-  protected $entityTypeManager;
+  protected $entityDefinition;
 
   /**
    * The entity display repository.
@@ -48,23 +47,44 @@ class FormModesSubscriber extends RouteSubscriberBase {
   protected $entityDisplayRepository;
 
   /**
-   * The entity display repository.
+   * The current instance of Routing Map plugin for a specific entity type.
    *
-   * @var \Drupal\form_mode_manager\FormModeManagerInterface
+   * @var \Drupal\form_mode_manager\EntityRoutingMapBase
    */
-  protected $formModeManager;
+  protected $entityRoutingDefinition;
 
   /**
-   * The Routes Manager Plugin.
+   * The Routing Map Plugin service.
    *
    * @var \Drupal\form_mode_manager\EntityRoutingMapManager
    */
   protected $entityRoutingMap;
 
   /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity Form Mode manager service.
+   *
+   * @var \Drupal\form_mode_manager\FormModeManagerInterface
+   */
+  protected $formModeManager;
+
+  /**
+   * The route collection for adding routes.
+   *
+   * @var \Symfony\Component\Routing\RouteCollection
+   */
+  protected $routeCollection;
+
+  /**
    * Constructs a new RouteSubscriber object.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
    *   The entity display repository.
@@ -73,233 +93,147 @@ class FormModesSubscriber extends RouteSubscriberBase {
    * @param \Drupal\form_mode_manager\EntityRoutingMapManager $plugin_routes_manager
    *   Plugin EntityRoutingMap to retrieve entity form operation routes.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager, EntityDisplayRepositoryInterface $entity_display_repository, FormModeManagerInterface $form_mode_manager, EntityRoutingMapManager $plugin_routes_manager) {
-    $this->entityTypeManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityDisplayRepositoryInterface $entity_display_repository, FormModeManagerInterface $form_mode_manager, EntityRoutingMapManager $plugin_routes_manager) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->entityDisplayRepository = $entity_display_repository;
     $this->formModeManager = $form_mode_manager;
     $this->entityRoutingMap = $plugin_routes_manager;
   }
 
   /**
+   * Add one route collection per entity using form modes.
+   *
    * {@inheritdoc}
    */
   protected function alterRoutes(RouteCollection $collection) {
-    $form_modes_definitions = $this->formModeManager->getAllFormModesDefinitions();
-    foreach ($form_modes_definitions as $entity_type_id => $form_modes) {
-      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-      $this->addFormModesRoutes($collection, $entity_type, $form_modes);
+    $this->routeCollection = $collection;
+    foreach ($this->formModeManager->getAllFormModesDefinitions() as $entity_type_id => $form_modes) {
+      $this->entityDefinition = $this->entityTypeManager->getDefinition($entity_type_id);
+      $this->entityRoutingDefinition = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id]);
+      $this->addFormModesRoutes($form_modes);
     }
   }
 
   /**
-   * Generate all operations routes for entities.
+   * Add a collection of route per form mode for current entity.
+   *
+   * Each entity need to define a collection of routes to be used by Drupal.
+   * Each `entity operation` is a form handler present for all,
+   * ContentEntityType plugins. Each operation represent a Form to be,
+   * displayed by formBuilder service in routes controllers.
+   * To respect core logic implemented by Drupal we need to add,
+   * a route for each operations (add/edit/add_page/admin_add) dynamically and,
+   * a transverse controller compatible to use form modes.
+   *
+   * Each routes generated by `setFormModeCollection` and,
+   * `setAddPageCollection` respect the following naming,
+   * `ENTITY_ROUTES_BASIS.FORM_MODE_NAME` eg for Node entity :
+   *
+   * @code
+   *  $routes = [
+   *    'add_form' => 'node.add.FORM_MODE_NAME',
+   *    'edit_form' => 'entity.node.edit_form.FORM_MODE_NAME',
+   *    'add_page' => 'form_mode_manager.node.add_page.FORM_MODE_NAME',
+   *    'admin_add' => 'node.add.FORM_MODE_NAME',
+   *  ];
+   * @endcode
    *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
    * @param array $form_modes
    *   All form-modes available for specified entity_type_id.
    */
-  protected function addFormModesRoutes(RouteCollection $collection, EntityTypeInterface $entity_type, array $form_modes) {
-    foreach ($form_modes as $form_mode) {
-      $this->setFormModeCollection($collection, $entity_type, $form_mode, 'admin_add');
-      $this->setFormModeCollection($collection, $entity_type, $form_mode, 'add_form');
-      $this->setFormModeCollection($collection, $entity_type, $form_mode, 'edit_form');
-      if (!empty($entity_type->getKey('bundle'))) {
-        $this->setAddPageCollection($collection, $entity_type, $form_mode);
+  protected function addFormModesRoutes(array $form_modes) {
+    foreach ($form_modes as $form_mode_infos) {
+      $this->setFormModeCollection($form_mode_infos, 'add_form');
+      $this->setFormModeCollection($form_mode_infos, 'edit_form');
+      $this->setFormModeCollection($form_mode_infos, 'admin_add');
+      if (!empty($this->entityDefinition->getKey('bundle'))) {
+        $this->setAddPageCollection($form_mode_infos);
       }
     }
   }
 
   /**
-   * Create a route per form_mode for given operation form.
+   * Create a route for given form mode and operation form handler.
    *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param array $form_mode
-   *   A form-mode for specified entity_type_id.
-   * @param string $operation
-   *   The entity operation name.
-   */
-  public function setFormModeCollection(RouteCollection $collection, EntityTypeInterface $entity_type, array $form_mode, $operation) {
-    /** @var \Drupal\form_mode_manager\EntityRoutingMapBase $entity_operation_mapping */
-    $entity_operation_mapping = $this->entityRoutingMap->createInstance($entity_type->id(), ['entityTypeId' => $entity_type->id()]);
-    if ($entity_operation_mapping->getOperation($operation) && $route = $this->getFormModeRoute($collection, $entity_type, $form_mode, $operation)) {
-      $form_mode_name = $this->formModeManager->getFormModeMachineName($form_mode['id']);
-      $collection->add($entity_operation_mapping->getOperation($operation) . ".$form_mode_name", $route);
-    }
-  }
-
-  /**
-   * Set one add_page route per form_mode for compatible entities.
+   * This method add a route for given form mode and respect the standard,
+   * of parent entity routing naming. All routes added in collection are,
+   * based on parrent route parameters and only add only,
+   * the minimum to use form modes. The route add only if parent entity,
+   * declare to use this operation in `entityRoutingMap` plugin.
    *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   A form-mode for specified entity_type_id.
-   *
-   * @todo Make this configurable.
-   */
-  public function setAddPageCollection(RouteCollection $collection, EntityTypeInterface $entity_type, array $form_mode) {
-    $form_mode_name = $this->formModeManager->getFormModeMachineName($form_mode['id']);
-    if ($route = $this->getFormModeListPageRoute($entity_type, $form_mode)) {
-      $collection->add("form_mode_manager.{$entity_type->id()}.add_page.$form_mode_name", $route);
-    }
-  }
-
-  /**
-   * Generate route to Form Mode Manager `add-list` route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition. Useful when a single class is,
-   *   used for multiple, possibly dynamic entity types.
-   * @param array $form_mode
-   *   An associative array represent a DisplayForm entity.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
+   * @param string $operation_name
+   *   The entity operation name.
    */
-  public function getFormModeListPageRoute(EntityTypeInterface $entity_type, array $form_mode) {
-    $route = NULL;
-    $entity_type_id = $entity_type->id();
-    $entity_type_bundle_id = $entity_type->getBundleEntityType();
-    $bundle_entity_type_id = !empty($entity_type_bundle_id) ? $entity_type_bundle_id : $entity_type_id;
-    $has_active_mode = $this->formModeManager->hasActiveFormMode(
-      $entity_type_id,
-      $this->formModeManager->getFormModeMachineName($form_mode['id'])
-    );
-
-    if ($has_active_mode) {
-      $route = new Route("/$entity_type_id/add-list/{$this->formModeManager->getFormModeMachineName($form_mode['id'])}");
-      $route
-        ->addDefaults([
-          '_controller' => static::FORM_MODE_DEFAULT_CONTROLLER . '::addPage',
-          '_title' => $this->t('Add @entity_type as @form_mode_label', ['@entity_type' => $entity_type->getLabel(), '@form_mode_label' => $form_mode['label']])
-            ->render(),
-          'form_mode_name' => $this->formModeManager->getFormModeMachineName($form_mode['id']),
-        ])
-        ->addRequirements([
-          '_permission' => "use {$form_mode['id']} form mode",
-        ])
-        ->setOptions([
-          '_form_mode_manager_entity_type_id' => $entity_type_id,
-          '_form_mode_manager_bundle_entity_type_id' => $bundle_entity_type_id,
-          '_admin_route' => TRUE,
-        ]);
-      $this->userListEnhancements($route, $entity_type->id());
+  public function setFormModeCollection(array $form_mode_infos, $operation_name) {
+    if ($this->entityRoutingDefinition->getOperation($operation_name) && $route = $this->getFormModeRoute($form_mode_infos, $operation_name)) {
+      $form_mode_name = $this->formModeManager->getFormModeMachineName($form_mode_infos['id']);
+      $form_mode_route_name = "{$this->entityRoutingDefinition->getOperation($operation_name)}.$form_mode_name";
+      $this->routeCollection->add($form_mode_route_name, $route);
     }
-
-    return $route;
   }
 
   /**
    * Get the Form Mode Manager route for given operation.
    *
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to retrieve parent entity routes.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   The form mode info.
-   * @param string $operation
+   * @param string $operation_name
    *   The entity operation name.
    *
    * @return \Symfony\Component\Routing\Route|null
    *   The generated route, if available.
    */
-  public function getFormModeRoute(RouteCollection $collection, EntityTypeInterface $entity_type, array $form_mode, $operation) {
-    $entity_type_id = $entity_type->id();
-    $has_active_mode = $this->formModeManager->hasActiveFormMode(
-      $entity_type_id,
-      $this->formModeManager->getFormModeMachineName($form_mode['id'])
-    );
-
-    /** @var \Drupal\form_mode_manager\EntityRoutingMapBase $entity_operation_mapping */
-    $entity_operation_mapping = $this->entityRoutingMap->createInstance($entity_type_id, ['entityTypeId' => $entity_type_id]);
-    if ($has_active_mode && $entity_edit_route = $collection->get($entity_operation_mapping->getOperation($operation))) {
-      return $this->setRoutes($entity_edit_route, $entity_type, $form_mode);
-    }
-
-    return NULL;
-  }
+  public function getFormModeRoute(array $form_mode_infos, $operation_name) {
+    $route_name = $this->entityRoutingDefinition->getOperation($operation_name);
+    $form_mode_machine_name = $this->formModeManager->getFormModeMachineName($form_mode_infos['id']);
+    $entity_type_id = $this->entityDefinition->id();
 
-  /**
-   * Set a specific callback for Edit context of User entity.
-   *
-   * @param \Symfony\Component\Routing\Route $route
-   *   The route object of entity.
-   * @param string $entity_type_id
-   *   The ID of the entity type.
-   */
-  public function userListEnhancements(Route $route, $entity_type_id) {
-    if ('user' !== $entity_type_id) {
-      return;
+    if ($this->formModeManager->hasActiveFormMode($entity_type_id, $form_mode_machine_name) && $entity_edit_route = $this->routeCollection->get($route_name)) {
+      return $this->setRoutes($entity_edit_route, $form_mode_infos);
     }
 
-    $route
-      ->setDefault('_controller', '\Drupal\form_mode_manager\Controller\UserFormModeController::entityAdd')
-      ->setDefault('_title_callback', '\Drupal\form_mode_manager\Controller\UserFormModeController::addPageTitle');
+    return NULL;
   }
 
   /**
-   * Set Form Mode Manager routes based on parent entity routes.
+   * Generate a routes based on top of given parent routes.
    *
    * @param \Symfony\Component\Routing\Route $parent_route
    *   The route object of entity.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   The form mode info.
    *
    * @return \Symfony\Component\Routing\Route
    *   Form Mode Manager route to be added on entity collection.
    */
-  private function setRoutes(Route $parent_route, EntityTypeInterface $entity_type, array $form_mode) {
-    $route_defaults = array_merge($parent_route->getDefaults(), $this->getFormModeRouteDefaults($parent_route, $form_mode));
-    $roue_options = array_merge($parent_route->getOptions(), $this->getFormModeRouteOptions($form_mode, $entity_type));
-    $route_requirements = array_merge($parent_route->getRequirements(), $this->getFormModeRouteRequirements($form_mode));
-
-    $route = new Route("{$parent_route->getPath()}/{$this->formModeManager->getFormModeMachineName($form_mode['id'])}");
-    $route
-      ->addDefaults($route_defaults)
-      ->setOptions($roue_options)
-      ->addRequirements($route_requirements);
-
-    return $route;
+  protected function setRoutes(Route $parent_route, array $form_mode_infos) {
+    $route_path = implode('/', [
+      $parent_route->getPath(),
+      $this->formModeManager->getFormModeMachineName($form_mode_infos['id']),
+    ]);
+    $route_defaults = array_merge($parent_route->getDefaults(), $this->getFormModeRouteDefaults($parent_route, $form_mode_infos));
+    $route_options = array_merge($parent_route->getOptions(), $this->getFormModeRouteOptions($form_mode_infos));
+    $route_requirements = array_merge($parent_route->getRequirements(), $this->getFormModeRouteRequirements($form_mode_infos));
+
+    return new Route($route_path, $route_defaults, $route_requirements, $route_options);
   }
 
   /**
-   * Evaluate if current context is edit.
+   * Get defaults parameters needed to build Form Mode Manager routes.
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route object of entity.
-   *
-   * @return bool
-   *   True if current route context is edit or False if not.
-   */
-  public static function isEditRoute(Route $route) {
-    return (bool) preg_match_all(self::ROUTE_PATH_CONTEXT_REGEX, $route->getPath(), $matches, PREG_SET_ORDER, 0);
-  }
-
-  /**
-   * Get defaults parameters nedeed to build Form Mode Manager routes.
-   *
-   * @param \Symfony\Component\Routing\Route $route
-   *   The route object of entity.
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   The form mode info.
    *
    * @return array
    *   Array contain defaults routes parameters.
    */
-  protected function getFormModeRouteDefaults(Route $route, array $form_mode) {
+  protected function getFormModeRouteDefaults(Route $route, array $form_mode_infos) {
     $route_parameters = [
-      '_entity_form' => $form_mode['id'],
+      '_entity_form' => $form_mode_infos['id'],
       '_controller' => static::FORM_MODE_DEFAULT_CONTROLLER . '::entityAdd',
       '_title_callback' => static::FORM_MODE_DEFAULT_CONTROLLER . '::addPageTitle',
     ];
@@ -313,30 +247,42 @@ class FormModesSubscriber extends RouteSubscriberBase {
   }
 
   /**
+   * Evaluate if current context is edit.
+   *
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route object of entity.
+   *
+   * @return bool
+   *   True if current route context is edit or False if not.
+   */
+  public static function isEditRoute(Route $route) {
+    return (bool) preg_match_all(self::ROUTE_PATH_CONTEXT_REGEX, $route->getPath(), $matches, PREG_SET_ORDER, 0);
+  }
+
+  /**
    * Get options parameters nedeed to build Form Mode Manager routes.
    *
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   The form mode info.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
    *
    * @return array
    *   Array contain options routes parameters.
    */
-  protected function getFormModeRouteOptions(array $form_mode, EntityTypeInterface $entity_type) {
-    $entity_type_id = $entity_type->id();
+  protected function getFormModeRouteOptions(array $form_mode_infos) {
+    $entity_definition = $this->entityDefinition;
+    $entity_type_id = $entity_definition->id();
     $route_definition = [
       '_form_mode_manager_entity_type_id' => $entity_type_id,
       'parameters' => [
         $entity_type_id => [
           'type' => "entity:$entity_type_id",
         ],
-        'form_mode' => $form_mode + ['type' => NULL],
+        'form_mode' => $form_mode_infos + ['type' => NULL],
       ],
     ];
 
-    if (!empty($entity_type->getKey('bundle'))) {
-      $route_definition['_form_mode_manager_bundle_entity_type_id'] = $entity_type->getBundleEntityType();
+    if (!empty($entity_definition->getKey('bundle'))) {
+      $route_definition['_form_mode_manager_bundle_entity_type_id'] = $entity_definition->getBundleEntityType();
     }
 
     return $route_definition;
@@ -345,17 +291,102 @@ class FormModesSubscriber extends RouteSubscriberBase {
   /**
    * Get options requirements nedeed to build Form Mode Manager routes.
    *
-   * @param array $form_mode
+   * @param array $form_mode_infos
    *   The form mode info.
    *
    * @return array
    *   Array contain requirements routes parameters.
    */
-  protected function getFormModeRouteRequirements(array $form_mode) {
+  protected function getFormModeRouteRequirements(array $form_mode_infos) {
     return [
-      '_permission' => "use {$form_mode['id']} form mode",
+      '_permission' => "use {$form_mode_infos['id']} form mode",
       '_custom_access' => static::FORM_MODE_DEFAULT_CONTROLLER . '::checkAccess',
     ];
   }
 
+  /**
+   * Add one route for `add_page` entity operation per form_mode.
+   *
+   * This page concern only bundled entities using a route for listing all,
+   * bundles using by this entity. Form mode manager add more granularity ,
+   * permit to choose what bundle is compatible with a specific form mode.
+   * This method add one listing route by form mode to provide,
+   * these granularity. Not all entities declare a `add_page` operation,
+   * because this isn't needed for all usecases but Form mode manager need,
+   * to add this possibility as a standard.
+   * All routes key are named with to follow these standard,
+   * `form_mode_manager.ENTITY_TYPE_ID.add_page.FORM_MODE_NAME`
+   *
+   * @param array $form_mode_infos
+   *   A form-mode for specified entity_type_id.
+   */
+  public function setAddPageCollection(array $form_mode_infos) {
+    $form_mode_name = $this->formModeManager->getFormModeMachineName($form_mode_infos['id']);
+    if ($route = $this->getFormModeListPageRoute($form_mode_infos)) {
+      $form_mode_route_name = "form_mode_manager.{$this->entityDefinition->id()}.add_page.$form_mode_name";
+      $this->routeCollection->add($form_mode_route_name, $route);
+    }
+  }
+
+  /**
+   * Generate routes to use `add-list` entity operation per form modes.
+   *
+   * @param array $form_mode_infos
+   *   An associative array represent a DisplayForm entity.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  public function getFormModeListPageRoute(array $form_mode_infos) {
+    $form_mode_machine_name = $this->formModeManager->getFormModeMachineName($form_mode_infos['id']);
+    $entity_type_id = $this->entityDefinition->id();
+    $route = NULL;
+
+    if ($this->formModeManager->hasActiveFormMode($entity_type_id, $form_mode_machine_name)) {
+      $route_path = implode('/', [
+        $entity_type_id,
+        'add-list',
+        $this->formModeManager->getFormModeMachineName($form_mode_infos['id']),
+      ]);
+
+      $route_defaults = [
+        '_controller' => static::FORM_MODE_DEFAULT_CONTROLLER . '::addPage',
+        '_title' => $this->getListRouteTitle($form_mode_infos['label']),
+        'form_mode_name' => $this->formModeManager->getFormModeMachineName($form_mode_infos['id']),
+      ];
+
+      $route_requirements = [
+        '_permission' => "use {$form_mode_infos['id']} form mode",
+      ];
+
+      $route_options = [
+        '_form_mode_manager_entity_type_id' => $entity_type_id,
+        '_form_mode_manager_bundle_entity_type_id' => $this->entityDefinition->getBundleEntityType(),
+        '_admin_route' => TRUE,
+      ];
+
+      $route = new Route("/$route_path", $route_defaults, $route_requirements, $route_options);
+    }
+
+    return $route;
+  }
+
+  /**
+   * Format the title for `add_list` routes.
+   *
+   * @param string $form_mode_label
+   *   The label of current DisplayForm entity.
+   *
+   * @return string
+   *   The translated title string of `add_list` operation routes.
+   */
+  public function getListRouteTitle($form_mode_label) {
+    $translatable_markup = $this->t('Add @entity_type as @form_mode_label', [
+      '@entity_type' => $this->entityDefinition->getLabel(),
+      '@form_mode_label' => $form_mode_label,
+    ]);
+
+    return $translatable_markup->render();
+  }
+
 }
diff --git a/tests/src/Functional/FormModeManagerBase.php b/tests/src/Functional/FormModeManagerBase.php
index b5a2782..16c15e2 100644
--- a/tests/src/Functional/FormModeManagerBase.php
+++ b/tests/src/Functional/FormModeManagerBase.php
@@ -20,6 +20,8 @@ abstract class FormModeManagerBase extends BrowserTestBase {
    */
   public static $modules = [
     'block',
+    'block_content',
+    'media',
     'entity_test',
     'field_ui',
     'node',