diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
index 44e65e1d66c..333956d5716 100644
--- a/bundles/best_practices.rst
+++ b/bundles/best_practices.rst
@@ -116,23 +116,23 @@ files are going to be part of the repository.
 The following classes and files have specific emplacements (some are mandatory
 and others are just conventions followed by most developers):
 
-===============================  =============================  ================
-Type                             Directory                      Mandatory?
-===============================  =============================  ================
-Commands                         ``Command/``                   Yes
-Controllers                      ``Controller/``                No
-Service Container Extensions     ``DependencyInjection/``       Yes
-Event Listeners                  ``EventListener/``             No
-Model classes [1]                ``Model/``                     No
-Configuration                    ``Resources/config/``          No
-Web Resources (CSS, JS, images)  ``Resources/public/``          Yes
-Translation files                ``Resources/translations/``    Yes
-Templates                        ``Resources/views/``           Yes
-Unit and Functional Tests        ``Tests/``                     No
-===============================  =============================  ================
-
-[1] See :doc:`/doctrine/mapping_model_classes` for how to handle the
-mapping with a compiler pass.
+===================================================  ========================================
+Type                                                 Directory                               
+===================================================  ========================================
+Commands                                             ``Command/``                            
+Controllers                                          ``Controller/``                         
+Service Container Extensions                         ``DependencyInjection/``                
+Doctrine ORM entities (when not using annotations)   ``Entity/``
+Doctrine ODM documents (when not using annotations)  ``Document/``
+Event Listeners                                      ``EventListener/``                      
+Configuration                                        ``Resources/config/``                   
+Web Resources (CSS, JS, images)                      ``Resources/public/``                   
+Translation files                                    ``Resources/translations/``     
+Validation (when not using annotations)              ``Resources/config/validation/``
+Serialization (when not using annotations)           ``Resources/config/serialization/``
+Templates                                            ``Resources/views/``                    
+Unit and Functional Tests                            ``Tests/``                              
+===================================================  ========================================
 
 Classes
 -------