diff --git a/composer.json b/composer.json
index 3b2c7825..dc7262df 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,9 @@
     },
     "suggest": {
         "doctrine/doctrine-orm-module": "For ORM mapping",
-        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping"
+        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping",
+        "api-skeletons/zf-doctrine-hydrator": "Hydrator strategies for Doctrine in Apipgility",
+        "api-skeletons/zf-oauth2-doctrine": "OAuth2 Doctrine Adapter for Apigility"
     },
     "prefer-stable": true,
     "autoload": {
diff --git a/src/Admin/Model/DoctrineRestServiceModel.php b/src/Admin/Model/DoctrineRestServiceModel.php
index 2acee4bf..ac35776e 100644
--- a/src/Admin/Model/DoctrineRestServiceModel.php
+++ b/src/Admin/Model/DoctrineRestServiceModel.php
@@ -768,23 +768,6 @@ public function createDoctrineConfig(DoctrineRestServiceEntity $details, $entity
         $objectManager      = $this->getServiceManager()->get($details->objectManager);
         $hydratorStrategies = array();
 
-        // Add all ORM collections to Hydrator Strategies
-        if ($objectManager instanceof \Doctrine\ORM\EntityManager) {
-            $collectionStrategyName = 'ZF\Apigility\Doctrine\Server\Hydrator\Strategy\CollectionLink';
-            $metadataFactory = $objectManager->getMetadataFactory();
-            $metadata = $metadataFactory->getMetadataFor($entityClass);
-
-            foreach ($metadata->associationMappings as $relationName => $relationMapping) {
-                switch ($relationMapping['type']) {
-                    case 4:
-                        $hydratorStrategies[$relationName] = $collectionStrategyName;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
         // The abstract_factories key is set to the value so these factories do not get duplicaed with each resource
         $config = array(
             'zf-apigility' => array(
diff --git a/src/Server/Hydrator/Strategy/CollectionExtract.php b/src/Server/Hydrator/Strategy/CollectionExtract.php
deleted file mode 100644
index b8980dd5..00000000
--- a/src/Server/Hydrator/Strategy/CollectionExtract.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace ZF\Apigility\Doctrine\Server\Hydrator\Strategy;
-
-use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
-use DoctrineModule\Stdlib\Hydrator\Strategy\AbstractCollectionStrategy;
-use ZF\Hal\Collection;
-
-/**
- * Class CollectionExtract
- * A field-specific hydrator for collections.
- *
- * @returns HalCollection
- */
-class CollectionExtract extends AbstractCollectionStrategy implements StrategyInterface
-{
-    public function extract($value)
-    {
-        $value = ($value)?: array();
-
-        $halCollection = new Collection($value);
-
-        return $halCollection;
-    }
-
-    public function hydrate($value)
-    {
-        // Hydration is not supported for collections.
-        // A call to PATCH will use hydration to extract then hydrate
-        // an entity. In this process a collection will be included
-        // so no error is thrown here.
-    }
-}
diff --git a/src/Server/Resource/DoctrineResourceFactory.php b/src/Server/Resource/DoctrineResourceFactory.php
index ed52c7e4..a475f78d 100644
--- a/src/Server/Resource/DoctrineResourceFactory.php
+++ b/src/Server/Resource/DoctrineResourceFactory.php
@@ -38,7 +38,6 @@ class DoctrineResourceFactory implements AbstractFactoryInterface
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
         if (array_key_exists($requestedName, $this->lookupCache)) {
-
             return $this->lookupCache[$requestedName];
         }