diff --git a/app/model/Database/Entity/Language.php b/app/model/Database/Entity/Language.php
index 0b83565..47b756f 100644
--- a/app/model/Database/Entity/Language.php
+++ b/app/model/Database/Entity/Language.php
@@ -7,7 +7,8 @@ use App\Model\Database\Entity\Attributes\TId;
 use Doctrine\Common\Collections\Collection;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\LanguageRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class Language extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/Pronunciation.php b/app/model/Database/Entity/Pronunciation.php
index 335260a..4a76425 100644
--- a/app/model/Database/Entity/Pronunciation.php
+++ b/app/model/Database/Entity/Pronunciation.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\TId;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\PronunciationRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class Pronunciation extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/PronunciationTypes.php b/app/model/Database/Entity/PronunciationTypes.php
index f37da0a..5771012 100644
--- a/app/model/Database/Entity/PronunciationTypes.php
+++ b/app/model/Database/Entity/PronunciationTypes.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\Tid;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\PronunciationTypeRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class PronunciationType extends AbstractEntity
 {
diff --git a/app/model/Database/Entity/Suffix.php b/app/model/Database/Entity/Suffix.php
index 0cf714a..05de4e2 100644
--- a/app/model/Database/Entity/Suffix.php
+++ b/app/model/Database/Entity/Suffix.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\TId;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\SuffixRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class Suffix extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/Term.php b/app/model/Database/Entity/Term.php
index b1381e8..94d066d 100644
--- a/app/model/Database/Entity/Term.php
+++ b/app/model/Database/Entity/Term.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\TId;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\TermRepository")
+ * @ORM\HasLifecycleCallbacks
  * @ORM\Table(indexes={@ORM\Index(columns={"string1"}, flags={"fulltext"}),
    @ORM\Index(columns={"string2"}, flags={"fulltext"})})
  */
diff --git a/app/model/Database/Entity/TermFlag.php b/app/model/Database/Entity/TermFlag.php
index 73cf8ed..566cb28 100644
--- a/app/model/Database/Entity/TermFlag.php
+++ b/app/model/Database/Entity/TermFlag.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\TId;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\TermFlagRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class TermFlag extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/WordClass.php b/app/model/Database/Entity/WordClass.php
index 1c98489..66ab5e3 100644
--- a/app/model/Database/Entity/WordClass.php
+++ b/app/model/Database/Entity/WordClass.php
@@ -6,7 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Model\Database\Entity\Attributes\TId;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="App\Model\Database\Repository\WordClassRepository")
+ * @ORM\HasLifecycleCallbacks
  */
 class WordClass extends AbstractEntity 
 {