diff --git a/Entity/Thread.php b/Entity/Thread.php
index 03607346..c6aba6a5 100644
--- a/Entity/Thread.php
+++ b/Entity/Thread.php
@@ -9,27 +9,28 @@
 use FOS\MessageBundle\Model\ParticipantInterface;
 
 use FOS\MessageBundle\Model\ThreadMetadata as ModelThreadMetadata;
+use FOS\MessageBundle\Model\ThreadMetadata;
 
 abstract class Thread extends BaseThread
 {
     /**
      * Messages contained in this thread
      *
-     * @var Collection of MessageInterface
+     * @var Collection|MessageInterface[]
      */
     protected $messages;
 
     /**
      * Users participating in this conversation
      *
-     * @var Collection of ParticipantInterface
+     * @var Collection|ParticipantInterface[]
      */
     protected $participants;
 
     /**
      * Thread metadata
      *
-     * @var Collection of ThreadMetadata
+     * @var Collection|ThreadMetadata[]
      */
     protected $metadata;
 
@@ -71,7 +72,7 @@ public function getParticipants()
      * Since the ORM schema does not map the participants collection field, it
      * must be created on demand.
      *
-     * @return ArrayCollection
+     * @return ArrayCollection|ParticipantInterface[]
      */
     protected function getParticipantsCollection()
     {
diff --git a/Model/Message.php b/Model/Message.php
index c2ad1393..15d07367 100644
--- a/Model/Message.php
+++ b/Model/Message.php
@@ -51,7 +51,7 @@ abstract class Message implements MessageInterface
     /**
      * Collection of MessageMetadata
      *
-     * @var Collection of MessageMetadata
+     * @var Collection|MessageMetadata[]
      */
     protected $metadata;
 
diff --git a/Model/Thread.php b/Model/Thread.php
index 163b3a81..20bf9d92 100644
--- a/Model/Thread.php
+++ b/Model/Thread.php
@@ -37,21 +37,21 @@ abstract class Thread implements ThreadInterface
     /**
      * Messages contained in this thread
      *
-     * @var Collection of MessageInterface
+     * @var Collection|MessageInterface[]
      */
     protected $messages;
 
     /**
      * Thread metadata
      *
-     * @var Collection of ThreadMetadata
+     * @var Collection|ThreadMetadata[]
      */
     protected $metadata;
 
     /**
      * Users participating in this conversation
      *
-     * @var Collection of ParticipantInterface
+     * @var Collection|ParticipantInterface[]
      */
     protected $participants;
 
diff --git a/Provider/Provider.php b/Provider/Provider.php
index 483f7459..90432752 100644
--- a/Provider/Provider.php
+++ b/Provider/Provider.php
@@ -2,6 +2,7 @@
 
 namespace FOS\MessageBundle\Provider;
 
+use FOS\MessageBundle\Model\ThreadInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use FOS\MessageBundle\ModelManager\ThreadManagerInterface;
diff --git a/Provider/ProviderInterface.php b/Provider/ProviderInterface.php
index 93cbff18..9be5e039 100644
--- a/Provider/ProviderInterface.php
+++ b/Provider/ProviderInterface.php
@@ -2,6 +2,8 @@
 
 namespace FOS\MessageBundle\Provider;
 
+use FOS\MessageBundle\Model\ThreadInterface;
+
 /**
  * Provides threads for the current authenticated user
  *
diff --git a/Search/Finder.php b/Search/Finder.php
index e52cce1a..c72ee4a2 100644
--- a/Search/Finder.php
+++ b/Search/Finder.php
@@ -2,6 +2,7 @@
 
 namespace FOS\MessageBundle\Search;
 
+use FOS\MessageBundle\Model\ThreadInterface;
 use FOS\MessageBundle\ModelManager\ThreadManagerInterface;
 use FOS\MessageBundle\Security\ParticipantProviderInterface;
 
diff --git a/Search/FinderInterface.php b/Search/FinderInterface.php
index b99b8d6d..f3708eff 100644
--- a/Search/FinderInterface.php
+++ b/Search/FinderInterface.php
@@ -2,6 +2,8 @@
 
 namespace FOS\MessageBundle\Search;
 
+use FOS\MessageBundle\Model\ThreadInterface;
+
 /**
  * Finds threads of a participant, matching a given query
  *