jsonapi.services.yml                               |   3 +
 src/Annotation/JsonApiResource.php                 |  61 --------
 src/Annotation/JsonApiResourceType.php             |  52 +++++++
 src/EntityCollection.php                           |   4 +-
 src/EntityCollectionInterface.php                  |   5 +-
 src/Plugin/Deriver/EntityDeriver.php               | 118 +++++++++++++++
 src/Plugin/Deriver/ResourceDeriver.php             |  82 -----------
 .../JsonApiResourceTypeInterface.php}              |  86 +++++------
 src/Plugin/JsonApiResourceTypeManager.php          |  36 +++++
 src/Plugin/jsonapi/BundleJsonApiResource.php       |  24 ----
 .../resource_type/EntityJsonApiResourceType.php}   |  56 +++++---
 src/Routing/Routes.php                             | 160 +++++++++------------
 12 files changed, 361 insertions(+), 326 deletions(-)

diff --git a/jsonapi.services.yml b/jsonapi.services.yml
index 28f5b7d..5f88434 100644
--- a/jsonapi.services.yml
+++ b/jsonapi.services.yml
@@ -82,6 +82,9 @@ services:
     arguments: ['@entity.manager']
   jsonapi.error_handler:
     class: Drupal\jsonapi\Error\ErrorHandler
+  plugin.manager.jsonapi.resource_type:
+    class: Drupal\jsonapi\Plugin\JsonApiResourceTypeManager
+    parent: default_plugin_manager
   jsonapi.exception_subscriber:
     class: Drupal\jsonapi\EventSubscriber\DefaultExceptionSubscriber
     tags:
diff --git a/src/Annotation/JsonApiResource.php b/src/Annotation/JsonApiResource.php
deleted file mode 100644
index 277de71..0000000
--- a/src/Annotation/JsonApiResource.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\jsonapi\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a JSON API Resource item annotation object.
- *
- * @see \Drupal\jsonapi\Plugin\JsonApiResourceManager
- * @see plugin_api
- *
- * @Annotation
- */
-class JsonApiResource extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The label of the plugin.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The entity type ID.
-   *
-   * @var string
-   */
-  public $entityType;
-
-  /**
-   * The bundle ID.
-   *
-   * @var string
-   */
-  public $bundle;
-
-  /**
-   * Information about the data resources.
-   *
-   * @var array
-   */
-  public $data;
-
-  /**
-   * TRUE if the plugin is enabled.
-   *
-   * @var bool
-   */
-  public $enabled;
-
-}
diff --git a/src/Annotation/JsonApiResourceType.php b/src/Annotation/JsonApiResourceType.php
new file mode 100644
index 0000000..a648df2
--- /dev/null
+++ b/src/Annotation/JsonApiResourceType.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\jsonapi\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines a JSON API resource 'type' annotation object.
+ *
+ * Plugin Namespace: Plugin\jsonapi\resource_type
+ *
+ * @see \Drupal\jsonapi\Plugin\JsonApiResourceTypeManager
+ * @see \Drupal\jsonapi\Plugin\JsonApiResourceTypeInterface
+ * @see plugin_api
+ *
+ * @see http://jsonapi.org/format/#document-resource-identifier-objects — 'type'
+ *
+ * @Annotation
+ */
+class JsonApiResourceType extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The label of the plugin.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
+   */
+  public $label;
+
+  /**
+   * The JSON API resource type.
+   *
+   * @var string
+   */
+  public $type;
+
+  /**
+   * The serialization class to deserialize serialized data into.
+   *
+   * @var string
+   */
+  public $serialization_class;
+
+}
diff --git a/src/EntityCollection.php b/src/EntityCollection.php
index 88223fa..917a300 100644
--- a/src/EntityCollection.php
+++ b/src/EntityCollection.php
@@ -3,9 +3,7 @@
 namespace Drupal\jsonapi;
 
 /**
- * Class EntityCollection.
- *
- * @package Drupal\jsonapi
+ * @internal
  */
 class EntityCollection implements EntityCollectionInterface {
 
diff --git a/src/EntityCollectionInterface.php b/src/EntityCollectionInterface.php
index 2069cc7..d7b1a8f 100644
--- a/src/EntityCollectionInterface.php
+++ b/src/EntityCollectionInterface.php
@@ -4,9 +4,8 @@
 namespace Drupal\jsonapi;
 
 /**
- * Class EntityCollectionInterface.
- *
- * @package Drupal\jsonapi
+ * @internal
+ * @todo Make this non-entity specific.
  */
 interface EntityCollectionInterface extends \IteratorAggregate, \Countable {
 
diff --git a/src/Plugin/Deriver/EntityDeriver.php b/src/Plugin/Deriver/EntityDeriver.php
new file mode 100644
index 0000000..552bc91
--- /dev/null
+++ b/src/Plugin/Deriver/EntityDeriver.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\jsonapi\Plugin\Deriver;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\jsonapi\Configuration\ResourceManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a resource plugin definition for every entity type and bundle.
+ *
+ * @see \Drupal\jsonapi\Plugin\jsonapi\resource_type\EntityJsonApiResourceType
+ */
+class EntityDeriver extends DeriverBase implements ContainerDeriverInterface {
+
+  /**
+   * List of derivative definitions.
+   *
+   * @var array
+   */
+  protected $derivatives;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The bundle manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleManager;
+
+  /**
+   * Constructs an EntityDeriver object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_manager
+   *   The bundle manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->bundleManager = $bundle_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, $base_plugin_id) {
+    return new static(
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    if (isset($this->derivatives)) {
+      return $this->derivatives;
+    }
+    $this->derivatives = [];
+
+    $entity_types = $this->entityTypeManager->getDefinitions();
+    foreach ($entity_types as $entity_type_id => $entity_type) {
+      $plugin_definition = [
+        'serialization_class' => $entity_type->getClass(),
+        'route_options' => [
+          'parameters' => [
+            $entity_type_id => [
+              'type' => 'entity:' . $entity_type_id,
+            ],
+          ],
+        ],
+        'route_path_part_for_individual_resource' => $entity_type_id,
+      ] + $base_plugin_definition;
+
+      // First derive a JSON API Resource Type for this entity type (this covers
+      // all bundles).
+      $id = sprintf('%s', $entity_type_id);
+      $this->derivatives[$id] = [
+        'id' => $id,
+        'type_hierarchy' => [$entity_type_id],
+        'route_requirements' => [
+          '_entity_type' => $entity_type_id,
+        ],
+      ] + $plugin_definition;
+
+      // Now derive an additional JSON API Resource Type for every bundle that
+      // exists for this entity type.
+      // @todo ensure new bundles are picked up immediately, see \Drupal\Core\Entity\EntityTypeBundleInfo::clearCachedBundles().
+      if ($entity_type->getBundleEntityType() !== NULL) {
+        $bundles = array_keys($this->bundleManager->getBundleInfo($entity_type_id));
+        foreach ($bundles as $bundle) {
+          $id = sprintf('%s.%s', $entity_type_id, $bundle);
+          $this->derivatives[$id] = [
+            'id' => $id,
+            'type_hierarchy' => [$entity_type_id, $bundle],
+            'route_requirements' => [
+              '_entity_type' => $entity_type_id,
+              '_bundle' => $bundle,
+            ],
+          ] + $plugin_definition;
+        }
+      }
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/src/Plugin/Deriver/ResourceDeriver.php b/src/Plugin/Deriver/ResourceDeriver.php
deleted file mode 100644
index 3048b62..0000000
--- a/src/Plugin/Deriver/ResourceDeriver.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\jsonapi\Plugin\Deriver;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\jsonapi\Configuration\ResourceManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a resource plugin definition for every entity type's bundle.
- *
- * @see \Drupal\jsonapi\Plugin\jsonapi\resource\BundleResource
- */
-class ResourceDeriver extends DeriverBase implements ContainerDeriverInterface {
-
-  /**
-   * List of derivative definitions.
-   *
-   * @var array
-   */
-  protected $derivatives;
-
-  /**
-   * The resource manager.
-   *
-   * @var \Drupal\jsonapi\Configuration\ResourceManagerInterface
-   */
-  protected $resourceManager;
-
-  /**
-   * Constructs an ResourceDeriver object.
-   *
-   * @param \Drupal\jsonapi\Configuration\ResourceManagerInterface $resource_manager
-   *   The entity manager.
-   */
-  public function __construct(ResourceManagerInterface $resource_manager) {
-    $this->resourceManager = $resource_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    /* @var \Drupal\jsonapi\Configuration\ResourceManagerInterface $resource_manager */
-    $resource_manager = $container->get('jsonapi.resource.manager');
-    return new static($resource_manager);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_definition) {
-    if (isset($this->derivatives)) {
-      return $this->derivatives;
-    }
-    $this->derivatives = [];
-    // Add in the default plugin configuration and the resource type.
-    /* @var \Drupal\jsonapi\Configuration\ResourceConfigInterface[] $resource_configs */
-    $resource_configs = $this->resourceManager->all();
-    foreach ($resource_configs as $resource) {
-      $global_config = $resource->getGlobalConfig();
-      $prefix = $global_config->get('prefix');
-      $id = sprintf('%s.dynamic.%s', $prefix, $resource->getTypeName());
-      $this->derivatives[$id] = [
-        'id' => $id,
-        'entityType' => $resource->getEntityTypeId(),
-        'bundle' => $resource->getBundleId(),
-        'hasBundle' => $this->resourceManager->hasBundle($resource->getEntityTypeId()),
-        'type' => $resource->getTypeName(),
-        'data' => [
-          'prefix' => $prefix,
-          'partialPath' => '/' . $prefix . $resource->getPath()
-        ]
-      ];
-
-      $this->derivatives[$id] += $base_definition;
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/src/Resource/EntityResourceInterface.php b/src/Plugin/JsonApiResourceTypeInterface.php
similarity index 55%
rename from src/Resource/EntityResourceInterface.php
rename to src/Plugin/JsonApiResourceTypeInterface.php
index 4c42bd4..965bb0d 100644
--- a/src/Resource/EntityResourceInterface.php
+++ b/src/Plugin/JsonApiResourceTypeInterface.php
@@ -1,23 +1,23 @@
 <?php
 
+namespace Drupal\jsonapi\Plugin;
 
-namespace Drupal\jsonapi\Resource;
-
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\Component\Plugin\PluginInspectionInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class EntityResourceInterface.
- *
- * @package Drupal\jsonapi\Resource
+ * Defines an interface for JSON API Resource Type plugins.
  */
-interface EntityResourceInterface {
+interface JsonApiResourceTypeInterface extends PluginInspectionInterface {
+
+  public function getDeserializationTargetClass();
+
 
   /**
-   * Gets the individual entity.
+   * Gets an individual resource object of this resource type.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The loaded entity.
+   * @param $object
+   *   A loaded resource object of this type, to return.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
    * @param int $response_code
@@ -26,51 +26,51 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function getIndividual(EntityInterface $entity, Request $request, $response_code = 200);
+  public function getIndividual($object, Request $request, $response_code = 200);
 
   /**
-   * Creates an individual entity.
+   * Creates an individual resource object of this resource type.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The loaded entity.
+   * @param $object
+   *   A loaded resource object of this type, to create.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
    *
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function createIndividual(EntityInterface $entity, Request $request);
+  public function createIndividual($object, Request $request);
 
   /**
-   * Patches an individual entity.
+   * Patches an individual resource object of this resource type.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The loaded entity.
-   * @param \Drupal\Core\Entity\EntityInterface $parsed_entity
-   *   The entity with the new data.
+   * @param $object
+   *   A loaded resource object of this type, to patch.
+   * @param $received_object
+   *   A loaded resource object of this type, to patch with.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
    *
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function patchIndividual(EntityInterface $entity, EntityInterface $parsed_entity, Request $request);
+  public function patchIndividual($object, $received_object, Request $request);
 
   /**
-   * Deletes an individual entity.
+   * Deletes an individual resource object of this resource type.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The loaded entity.
+   * @param $object
+   *   A loaded resource object of this type, to delete.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
    *
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function deleteIndividual(EntityInterface $entity, Request $request);
+  public function deleteIndividual($object, Request $request);
 
   /**
-   * Gets the collection of entities.
+   * Gets the collection of resource objects of this resource type.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
@@ -83,8 +83,8 @@ interface EntityResourceInterface {
   /**
    * Gets the related resource.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The requested entity.
+   * @param $object
+   *   A loaded resource object of this type, to return a related resource for.
    * @param string $related_field
    *   The related field name.
    * @param \Symfony\Component\HttpFoundation\Request $request
@@ -93,13 +93,13 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function getRelated(EntityInterface $entity, $related_field, Request $request);
+  public function getRelated($object, $related_field, Request $request);
 
   /**
-   * Gets the relationship of an entity.
+   * Gets the relationship of an object.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The requested entity.
+   * @param $object
+   *   A loaded resource object of this type, to return a relationship for.
    * @param string $related_field
    *   The related field name.
    * @param \Symfony\Component\HttpFoundation\Request $request
@@ -110,13 +110,13 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function getRelationship(EntityInterface $entity, $related_field, Request $request, $response_code = 200);
+  public function getRelationship($object, $related_field, Request $request, $response_code = 200);
 
   /**
    * Adds a relationship to a to-many relationship.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The requested entity.
+   * @param $object
+   *   A loaded resource object of this type, to create a relationship for.
    * @param string $related_field
    *   The related field name.
    * @param mixed $parsed_field_list
@@ -128,13 +128,13 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function createRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request);
+  public function createRelationship($object, $related_field, $parsed_field_list, Request $request);
 
   /**
-   * Updates the relationship of an entity.
+   * Updates the relationship of an object.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The requested entity.
+   * @param $object
+   *   A loaded resource object of this type, to patch a relationship for.
    * @param string $related_field
    *   The related field name.
    * @param mixed $parsed_field_list
@@ -146,13 +146,13 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function patchRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request);
+  public function patchRelationship($object, $related_field, $parsed_field_list, Request $request);
 
   /**
    * Deletes the relationship of an entity.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The requested entity.
+   * @param $object
+   *   A loaded resource object of this type, to delete a relationship for.
    * @param string $related_field
    *   The related field name.
    * @param mixed $parsed_field_list
@@ -164,6 +164,6 @@ interface EntityResourceInterface {
    * @return \Drupal\jsonapi\ResourceResponse
    *   The response.
    */
-  public function deleteRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request);
+  public function deleteRelationship($object, $related_field, $parsed_field_list, Request $request);
 
 }
diff --git a/src/Plugin/JsonApiResourceTypeManager.php b/src/Plugin/JsonApiResourceTypeManager.php
new file mode 100644
index 0000000..ebed15b
--- /dev/null
+++ b/src/Plugin/JsonApiResourceTypeManager.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\jsonapi\Plugin;
+
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+
+/**
+ * Provides the JSON API Resource Type plugin manager.
+ */
+class JsonApiResourceTypeManager extends DefaultPluginManager {
+
+  /**
+   * Constructor for JsonApiResourceTypeManager objects.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
+    // For now, only allow the JSON API module to provide JSON API Resource Type
+    // plugins. The API is not yet finalized, and it's not yet clear whether it
+    // would make sense to allow additional types beyond entity types and entity
+    // type bundles.
+    $limited_namespaces = new \ArrayObject(['\Drupal\jsonapi' => $namespaces['Drupal\jsonapi']]);
+
+    parent::__construct('Plugin/jsonapi', $limited_namespaces, $module_handler, 'Drupal\jsonapi\Plugin\JsonApiResourceInterface', 'Drupal\jsonapi\Annotation\JsonApiResourceType');
+    $this->setCacheBackend($cache_backend, 'jsonapi_resource_type_plugins');
+  }
+
+}
diff --git a/src/Plugin/jsonapi/BundleJsonApiResource.php b/src/Plugin/jsonapi/BundleJsonApiResource.php
deleted file mode 100644
index bf97da3..0000000
--- a/src/Plugin/jsonapi/BundleJsonApiResource.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\jsonapi\Plugin\jsonapi;
-
-use Drupal\Core\Plugin\ContextAwarePluginBase;
-use Drupal\jsonapi\Plugin\JsonApiResourceBase;
-use Drupal\jsonapi\Plugin\JsonApiResourceInterface;
-
-/**
- * Class BundleJsonApiResource
- *
- * Represents bundles as JSON API resources.
- *
- * @see \Drupal\jsonapi\Plugin\Deriver\ResourceDeriver
- *
- * @JsonApiResource(
- *   id = "bundle",
- *   label = @Translation("Bundle"),
- *   deriver = "Drupal\jsonapi\Plugin\Deriver\ResourceDeriver",
- * )
- *
- * @package Drupal\jsonapi\Plugin\jsonapi
- */
-class BundleJsonApiResource extends ContextAwarePluginBase implements JsonApiResourceInterface {}
diff --git a/src/Resource/EntityResource.php b/src/Plugin/jsonapi/resource_type/EntityJsonApiResourceType.php
similarity index 91%
rename from src/Resource/EntityResource.php
rename to src/Plugin/jsonapi/resource_type/EntityJsonApiResourceType.php
index 6067824..5e0ea64 100644
--- a/src/Resource/EntityResource.php
+++ b/src/Plugin/jsonapi/resource_type/EntityJsonApiResourceType.php
@@ -1,25 +1,23 @@
 <?php
 
-namespace Drupal\jsonapi\Resource;
+namespace Drupal\jsonapi\Plugin\jsonapi\resource_type;
 
-use Drupal\Component\Serialization\Json;
 use Drupal\Core\Access\AccessibleInterface;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
-use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
-use Drupal\jsonapi\Configuration\ResourceConfigInterface;
+use Drupal\Core\Plugin\PluginBase;
 use Drupal\jsonapi\EntityCollection;
 use Drupal\jsonapi\EntityCollectionInterface;
 use Drupal\jsonapi\Error\SerializableHttpException;
-use Drupal\jsonapi\Query\QueryBuilderInterface;
-use Drupal\jsonapi\Context\CurrentContextInterface;
+use Drupal\jsonapi\Plugin\JsonApiResourceBase;
+use Drupal\jsonapi\Plugin\JsonApiResourceInterface;
+use Drupal\jsonapi\Plugin\JsonApiResourceTypeInterface;
+use Drupal\jsonapi\Resource\DocumentWrapper;
 use Drupal\jsonapi\ResourceResponse;
 use Drupal\jsonapi\Routing\Param\JsonApiParamBase;
 use Drupal\jsonapi\Routing\Param\OffsetPage;
@@ -27,11 +25,17 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class EntityResource.
+ * Represents entity types (and their bundles) as JSON API resource types.
  *
- * @package Drupal\jsonapi\Resource
+ * @see \Drupal\jsonapi\Plugin\Deriver\ResourceDeriver
+ *
+ * @JsonApiResourceType(
+ *   id = "entity",
+ *   label = @Translation("Entity"),
+ *   deriver = "Drupal\jsonapi\Plugin\Deriver\EntityDeriver",
+ * )
  */
-class EntityResource implements EntityResourceInterface {
+class EntityJsonApiResourceType extends PluginBase implements JsonApiResourceTypeInterface  {
 
   /**
    * The resource config.
@@ -103,7 +107,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function getIndividual(EntityInterface $entity, Request $request, $response_code = 200) {
+  public function getIndividual($entity, Request $request, $response_code = 200) {
+    assert($entity instanceof EntityInterface);
     $entity_access = $entity->access('view', NULL, TRUE);
     if (!$entity_access->isAllowed()) {
       throw new SerializableHttpException(403, 'The current user is not allowed to GET the selected resource.');
@@ -121,7 +126,8 @@ class EntityResource implements EntityResourceInterface {
    * @throws \Drupal\jsonapi\Error\SerializableHttpException
    *   If validation errors are found.
    */
-  protected function validate(EntityInterface $entity) {
+  protected function validate($entity) {
+    assert($entity instanceof EntityInterface);
     if (!$entity instanceof FieldableEntityInterface) {
       return;
     }
@@ -148,7 +154,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function createIndividual(EntityInterface $entity, Request $request) {
+  public function createIndividual($entity, Request $request) {
+    assert($entity instanceof EntityInterface);
     $entity_access = $entity->access('create', NULL, TRUE);
 
     if (!$entity_access->isAllowed()) {
@@ -162,7 +169,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function patchIndividual(EntityInterface $entity, EntityInterface $parsed_entity, Request $request) {
+  public function patchIndividual($entity, EntityInterface $parsed_entity, Request $request) {
+    assert($entity instanceof EntityInterface);
     $entity_access = $entity->access('update', NULL, TRUE);
     if (!$entity_access->isAllowed()) {
       throw new SerializableHttpException(403, 'The current user is not allowed to GET the selected resource.');
@@ -192,7 +200,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function deleteIndividual(EntityInterface $entity, Request $request) {
+  public function deleteIndividual($entity, Request $request) {
+    assert($entity instanceof EntityInterface);
     $entity_access = $entity->access('delete', NULL, TRUE);
     if (!$entity_access->isAllowed()) {
       throw new SerializableHttpException(403, 'The current user is not allowed to DELETE the selected resource.');
@@ -242,7 +251,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function getRelated(EntityInterface $entity, $related_field, Request $request) {
+  public function getRelated($entity, $related_field, Request $request) {
+    assert($entity instanceof EntityInterface);
     /* @var $field_list \Drupal\Core\Field\FieldItemListInterface */
     if (!($field_list = $entity->get($related_field)) || !$this->isRelationshipField($field_list)) {
       throw new SerializableHttpException(404, sprintf('The relationship %s is not present in this resource.', $related_field));
@@ -266,7 +276,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function getRelationship(EntityInterface $entity, $related_field, Request $request, $response_code = 200) {
+  public function getRelationship($entity, $related_field, Request $request, $response_code = 200) {
+    assert($entity instanceof EntityInterface);
     if (!($field_list = $entity->get($related_field)) || !$this->isRelationshipField($field_list)) {
       throw new SerializableHttpException(404, sprintf('The relationship %s is not present in this resource.', $related_field));
     }
@@ -277,7 +288,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function createRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request) {
+  public function createRelationship($entity, $related_field, $parsed_field_list, Request $request) {
+    assert($entity instanceof EntityInterface);
     if ($parsed_field_list instanceof Response) {
       // This usually means that there was an error, so there is no point on
       // processing further.
@@ -312,7 +324,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function patchRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request) {
+  public function patchRelationship($entity, $related_field, $parsed_field_list, Request $request) {
+    assert($entity instanceof EntityInterface);
     if ($parsed_field_list instanceof Response) {
       // This usually means that there was an error, so there is no point on
       // processing further.
@@ -371,7 +384,8 @@ class EntityResource implements EntityResourceInterface {
   /**
    * {@inheritdoc}
    */
-  public function deleteRelationship(EntityInterface $entity, $related_field, $parsed_field_list, Request $request) {
+  public function deleteRelationship($entity, $related_field, $parsed_field_list, Request $request) {
+    assert($entity instanceof EntityInterface);
     if ($parsed_field_list instanceof Response) {
       // This usually means that there was an error, so there is no point on
       // processing further.
diff --git a/src/Routing/Routes.php b/src/Routing/Routes.php
index f2f1176..606163c 100644
--- a/src/Routing/Routes.php
+++ b/src/Routing/Routes.php
@@ -7,7 +7,7 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
-use Drupal\jsonapi\Plugin\JsonApiResourceManager;
+use Drupal\jsonapi\Plugin\JsonApiResourceTypeManager;
 use Drupal\jsonapi\Resource\DocumentWrapperInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -29,6 +29,11 @@ class Routes implements ContainerInjectionInterface {
   const FRONT_CONTROLLER = '\Drupal\jsonapi\RequestHandler::handle';
 
   /**
+   * @var \Drupal\jsonapi\Plugin\JsonApiResourceTypeManager
+   */
+  protected $jsonApiResourceTypeManager;
+
+  /**
    * The entity type manager.
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
@@ -66,7 +71,8 @@ class Routes implements ContainerInjectionInterface {
    * @param \Drupal\Core\Authentication\AuthenticationCollectorInterface $auth_collector
    *   The authentication collector.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_manager, AuthenticationCollectorInterface $auth_collector) {
+  public function __construct(JsonApiResourceTypeManager $json_api_resource_type_manager, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_manager, AuthenticationCollectorInterface $auth_collector) {
+    $this->jsonApiResourceTypeManager = $json_api_resource_type_manager;
     $this->entityTypeManager = $entity_type_manager;
     $this->bundleManager = $bundle_manager;
     $this->authCollector = $auth_collector;
@@ -77,6 +83,7 @@ class Routes implements ContainerInjectionInterface {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('plugin.manager.jsonapi.resource_type'),
       $container->get('entity_type.manager'),
       $container->get('entity_type.bundle.info'),
       $container->get('authentication_collector')
@@ -89,93 +96,68 @@ class Routes implements ContainerInjectionInterface {
   public function routes() {
     $collection = new RouteCollection();
 
-    $resources = [];
-    $entity_type_ids = array_keys($this->entityTypeManager->getDefinitions());
-    foreach ($entity_type_ids as $entity_type_id) {
-      $bundles = array_keys($this->bundleManager->getBundleInfo($entity_type_id));
-      // Also generate a route for the entity type, i.e. for all bundles.
-      array_unshift($bundles, NULL);
-      foreach ($bundles as $bundle) {
-        $route_name_prefix = $bundle
-          ? sprintf('jsonapi.%s.%s.', $entity_type_id, $bundle)
-          : sprintf('jsonapi.%s.', $entity_type_id);
-
-        $path_prefix = $bundle
-          ? sprintf('/api/%s/%s', $entity_type_id, $bundle)
-          : sprintf('/api/%s', $entity_type_id);
-
-        // Add the collection route.
-        $defaults = [
-          RouteObjectInterface::CONTROLLER_NAME => static::FRONT_CONTROLLER,
-        ];
-        // Options that apply to all routes.
-        $options = [
-          '_auth' => $this->authProviderList(),
-          '_is_jsonapi' => TRUE,
-        ];
-
-        // Collection endpoint, like /api/file/photo.
-        $route_collection = (new Route($path_prefix))
-          ->addDefaults($defaults)
-          ->setRequirement('_entity_type', $entity_type_id)
-          ->setRequirement('_format', 'api_json')
-          ->setRequirement('_custom_parameter_names', 'TRUE')
-          ->setOption('serialization_class', DocumentWrapperInterface::class)
-          ->setMethods(['GET', 'POST']);
-        if ($bundle) {
-          $route_collection->setRequirement('_bundle', $bundle);
-        }
-        $route_collection->addOptions($options);
-        $collection->add($route_name_prefix . 'collection', $route_collection);
-
-        // Individual endpoint, like /api/file/photo/123.
-        $parameters = [$entity_type_id => ['type' => 'entity:' . $entity_type_id]];
-        $route_individual = (new Route(sprintf('%s/{%s}', $path_prefix, $entity_type_id)))
-          ->addDefaults($defaults)
-          ->setRequirement('_entity_type', $entity_type_id)
-          ->setRequirement('_format', 'api_json')
-          ->setRequirement('_custom_parameter_names', 'TRUE')
-          ->setOption('parameters', $parameters)
-          ->setOption('_auth', $this->authProviderList())
-          ->setOption('serialization_class', DocumentWrapperInterface::class)
-          ->setMethods(['GET', 'PATCH', 'DELETE']);
-        if ($bundle) {
-          $route_individual->setRequirement('_bundle', $bundle);
-        }
-        $route_individual->addOptions($options);
-        $collection->add($route_name_prefix . 'individual', $route_individual);
-
-        // Related resource, like /api/file/photo/123/comments.
-        $route_related = (new Route(sprintf('%s/{%s}/{related}', $path_prefix, $entity_type_id)))
-          ->addDefaults($defaults)
-          ->setRequirement('_entity_type', $entity_type_id)
-          ->setRequirement('_format', 'api_json')
-          ->setRequirement('_custom_parameter_names', 'TRUE')
-          ->setOption('parameters', $parameters)
-          ->setOption('_auth', $this->authProviderList())
-          ->setMethods(['GET']);
-        if ($bundle) {
-          $route_related->setRequirement('_bundle', $bundle);
-        }
-        $route_related->addOptions($options);
-        $collection->add($route_name_prefix . 'related', $route_related);
-
-        // Related endpoint, like /api/file/photo/123/relationships/comments.
-        $route_relationship = (new Route(sprintf('%s/{%s}/relationships/{related}', $path_prefix, $entity_type_id)))
-          ->addDefaults($defaults + ['_on_relationship' => TRUE])
-          ->setRequirement('_entity_type', $entity_type_id)
-          ->setRequirement('_format', 'api_json')
-          ->setRequirement('_custom_parameter_names', 'TRUE')
-          ->setOption('parameters', $parameters)
-          ->setOption('_auth', $this->authProviderList())
-          ->setOption('serialization_class', EntityReferenceFieldItemList::class)
-          ->setMethods(['GET', 'POST', 'PATCH', 'DELETE']);
-        if ($bundle) {
-          $route_relationship->setRequirement('_bundle', $bundle);
-        }
-        $route_relationship->addOptions($options);
-        $collection->add($route_name_prefix . 'relationship', $route_relationship);
-      }
+    foreach ($this->jsonApiResourceTypeManager->getDefinitions() as $id => $definition) {
+      $route_name_prefix = 'jsonapi.' . implode('.', $definition['type_hierarchy']);
+      $path_prefix = '/api/' . implode('/', $definition['type_hierarchy']);
+
+      // Add the collection route.
+      $defaults = [
+        RouteObjectInterface::CONTROLLER_NAME => static::FRONT_CONTROLLER,
+      ];
+      // Options that apply to all routes.
+      $options = [
+        '_auth' => $this->authProviderList(),
+        '_is_jsonapi' => TRUE,
+      ];
+
+      // Collection endpoint, like /api/file/photo.
+      $route_collection = (new Route($path_prefix))
+        ->addDefaults($defaults)
+        ->addRequirements($definition['route_requirements'])
+        ->setRequirement('_format', 'api_json')
+        ->setRequirement('_custom_parameter_names', 'TRUE')
+        ->setOption('serialization_class', DocumentWrapperInterface::class)
+        ->setMethods(['GET', 'POST']);
+      $route_collection->addOptions($options);
+      $collection->add($route_name_prefix . '.collection', $route_collection);
+
+      // Individual endpoint, like /api/file/photo/123.
+      $route_individual = (new Route(sprintf('%s/{%s}', $path_prefix, $definition['route_path_part_for_individual_resource'])))
+        ->addDefaults($defaults)
+        ->addRequirements($definition['route_requirements'])
+        ->setRequirement('_format', 'api_json')
+        ->setRequirement('_custom_parameter_names', 'TRUE')
+        ->addOptions($definition['route_options'])
+        ->setOption('_auth', $this->authProviderList())
+        ->setOption('serialization_class', DocumentWrapperInterface::class)
+        ->setMethods(['GET', 'PATCH', 'DELETE']);
+      $route_individual->addOptions($options);
+      $collection->add($route_name_prefix . '.individual', $route_individual);
+
+      // Related resource, like /api/file/photo/123/comments.
+      $route_related = (new Route(sprintf('%s/{%s}/{related}', $path_prefix, $definition['route_path_part_for_individual_resource'])))
+        ->addDefaults($defaults)
+        ->addRequirements($definition['route_requirements'])
+        ->setRequirement('_format', 'api_json')
+        ->setRequirement('_custom_parameter_names', 'TRUE')
+        ->addOptions($definition['route_options'])
+        ->setOption('_auth', $this->authProviderList())
+        ->setMethods(['GET']);
+      $route_related->addOptions($options);
+      $collection->add($route_name_prefix . '.related', $route_related);
+
+      // Related endpoint, like /api/file/photo/123/relationships/comments.
+      $route_relationship = (new Route(sprintf('%s/{%s}/relationships/{related}', $path_prefix, $definition['route_path_part_for_individual_resource'])))
+        ->addDefaults($defaults + ['_on_relationship' => TRUE])
+        ->addRequirements($definition['route_requirements'])
+        ->setRequirement('_format', 'api_json')
+        ->setRequirement('_custom_parameter_names', 'TRUE')
+        ->addOptions($definition['route_options'])
+        ->setOption('_auth', $this->authProviderList())
+        ->setOption('serialization_class', EntityReferenceFieldItemList::class)
+        ->setMethods(['GET', 'POST', 'PATCH', 'DELETE']);
+      $route_relationship->addOptions($options);
+      $collection->add($route_name_prefix . '.relationship', $route_relationship);
     }
 
     return $collection;