diff --git a/app/model/Database/Entity/Dictionary.php b/app/model/Database/Entity/Dictionary.php
index d2b4eff..d197cd7 100644
--- a/app/model/Database/Entity/Dictionary.php
+++ b/app/model/Database/Entity/Dictionary.php
@@ -11,6 +11,13 @@ use Doctrine\Common\Collections\Collection;
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\DictionaryRepository")
  * @ORM\Table(name="`dictionary`")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property String $name
+ * @property String $fullname
+ * @property Term $terms
+ * @property Language $lang1
+ * @property Language $lang2
  */
 class Dictionary extends AbstractEntity
 {
diff --git a/app/model/Database/Entity/Language.php b/app/model/Database/Entity/Language.php
index d32c98d..0a701a6 100644
--- a/app/model/Database/Entity/Language.php
+++ b/app/model/Database/Entity/Language.php
@@ -9,6 +9,13 @@ use Doctrine\Common\Collections\Collection;
 /**
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\LanguageRepository")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property String $name
+ * @property String $shortName
+ * @property Dictionary $dictionaries1
+ * @property Dictionary $dictionaries2
+ * 
  */
 class Language extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/Pronunciation.php b/app/model/Database/Entity/Pronunciation.php
index 4a76425..ff7cc88 100644
--- a/app/model/Database/Entity/Pronunciation.php
+++ b/app/model/Database/Entity/Pronunciation.php
@@ -8,6 +8,12 @@ use App\Model\Database\Entity\Attributes\TId;
 /**
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\PronunciationRepository")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property Term $terms
+ * @property PronunciationType $type
+ * @property String $ipa
+ * @property String $filename
  */
 class Pronunciation extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/PronunciationType.php b/app/model/Database/Entity/PronunciationType.php
index 5771012..fcd11e6 100644
--- a/app/model/Database/Entity/PronunciationType.php
+++ b/app/model/Database/Entity/PronunciationType.php
@@ -8,6 +8,10 @@ use App\Model\Database\Entity\Attributes\Tid;
 /**
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\PronunciationTypeRepository")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property String $name
+ * @property String $fullName
  */
 class PronunciationType extends AbstractEntity
 {
diff --git a/app/model/Database/Entity/TermFlag.php b/app/model/Database/Entity/TermFlag.php
index 566cb28..e3e9727 100644
--- a/app/model/Database/Entity/TermFlag.php
+++ b/app/model/Database/Entity/TermFlag.php
@@ -8,6 +8,12 @@ use App\Model\Database\Entity\Attributes\TId;
 /**
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\TermFlagRepository")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property WordClass $class
+ * @property Language $language
+ * @property String $code
+ * @property String $description
  */
 class TermFlag extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/Translation.php b/app/model/Database/Entity/Translation.php
index d5ba049..f998761 100644
--- a/app/model/Database/Entity/Translation.php
+++ b/app/model/Database/Entity/Translation.php
@@ -10,6 +10,11 @@ use App\Model\Database\Entity\Attributes\TId;
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\TranslationRepository")
  * @ORM\Table(name="`translation`")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property Dictionary $dictionary
+ * @property Language $lang1
+ * @property Language $lang2
+ * @property int $direction
  */
 class Translation extends AbstractEntity 
 {
diff --git a/app/model/Database/Entity/WordClass.php b/app/model/Database/Entity/WordClass.php
index 66ab5e3..1ed668e 100644
--- a/app/model/Database/Entity/WordClass.php
+++ b/app/model/Database/Entity/WordClass.php
@@ -8,6 +8,10 @@ use App\Model\Database\Entity\Attributes\TId;
 /**
  * @ORM\Entity(repositoryClass="App\Model\Database\Repository\WordClassRepository")
  * @ORM\HasLifecycleCallbacks
+ * 
+ * @property int $id
+ * @property String $name
+ * 
  */
 class WordClass extends AbstractEntity 
 {
@@ -18,18 +22,7 @@ class WordClass extends AbstractEntity
     {
     	$this->id = $id;
 	$this->name = $name;
-    }
-
-    public function setId($id)
-    {
-	$this->id = $id;
-	return $id;
-    }
-
-    public function getId()
-    {
-	return $this->id;
-    }
+    }  
     
     /**
      * @ORM\Column(type="string")