diff --git a/src/Chamilo/CoreBundle/Migrations/Schema/v1/Version110.php b/src/Chamilo/CoreBundle/Migrations/Schema/v1/Version110.php
index 93f3c489eb..daa8dfdbc5 100644
--- a/src/Chamilo/CoreBundle/Migrations/Schema/v1/Version110.php
+++ b/src/Chamilo/CoreBundle/Migrations/Schema/v1/Version110.php
@@ -91,12 +91,98 @@ class Version110 extends AbstractMigration
 
         // Add iid
         $tables = [
-            'c_group_info',
+            'c_announcement',
+            'c_announcement_attachment',
+            'c_attendance',
+            'c_attendance_calendar',
+            'c_attendance_calendar_rel_group',
+            'c_attendance_result',
+            //'c_attendance_sheet',
+            'c_attendance_sheet_log',
+            //'c_blog',
+            'c_blog_attachment',
+            //'c_blog_comment',
+            //'c_blog_post',
+            //'c_blog_rating',
+            //'c_blog_rel_user',
+            'c_blog_task',
+            'c_blog_task_rel_user',
+            'c_calendar_event',
+            'c_calendar_event_attachment',
+            'c_calendar_event_repeat',
+            'c_calendar_event_repeat_not',
+            'c_chat_connected',
+            'c_course_description',
             'c_course_setting',
-            'c_tool',
-            'c_group_info',
             'c_document',
-            'c_item_property'
+            //'c_dropbox_category',
+            //'c_dropbox_feedback',
+            'c_dropbox_file',
+            //'c_dropbox_person',
+            //'c_dropbox_post',
+            'c_forum_attachment',
+            //'c_forum_category',
+            //'c_forum_forum',
+            'c_forum_mailcue',
+            'c_forum_notification',
+            'c_forum_post',
+            //'c_forum_thread',
+            'c_forum_thread_qualify',
+            'c_forum_thread_qualify_log',
+            //'c_glossary',
+            'c_group_category',
+            //'c_group_info',
+            'c_group_rel_tutor',
+            'c_group_rel_user',
+            'c_item_property',
+            'c_link',
+            'c_link_category',
+            'c_lp',
+            'c_lp_item',
+            'c_lp_item_view',
+            'c_lp_iv_interaction',
+            'c_lp_iv_objective',
+            'c_lp_view',
+            //'c_notebook',
+            //'c_online_connected',
+            'c_online_link',
+            'c_permission_group',
+            'c_permission_task',
+            'c_permission_user',
+            'c_quiz',
+            //'c_quiz_answer',
+            'c_quiz_question',
+            'c_quiz_question_category',
+            'c_quiz_question_option',
+            //'c_quiz_question_rel_category',
+            //'c_quiz_rel_question',
+            'c_resource',
+            //'c_role',
+            'c_role_group',
+            'c_role_permissions',
+            //'c_role_user',
+            'c_student_publication',
+            'c_student_publication_assignment',
+            'c_student_publication_comment',
+            'c_student_publication_rel_document',
+            'c_student_publication_rel_user',
+            //'c_survey',
+            //'c_survey_answer',
+            'c_survey_group',
+            //'c_survey_invitation',
+            //'c_survey_question',
+            //'c_survey_question_option',
+            'c_thematic',
+            'c_thematic_advance',
+            'c_thematic_plan',
+            'c_tool',
+            'c_tool_intro',
+            'c_userinfo_content',
+            'c_userinfo_def',
+            'c_wiki',
+            //'c_wiki_conf',
+            'c_wiki_discuss',
+            'c_wiki_mailcue'
         ];
 
         foreach ($tables as $table) {
@@ -106,6 +192,176 @@ class Version110 extends AbstractMigration
             $this->addSql("ALTER TABLE $table ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
         }
 
+        $this->addSql("ALTER TABLE c_attendance_sheet MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_attendance_sheet DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_attendance_sheet ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog MODIFY COLUMN blog_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_comment MODIFY COLUMN comment_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_comment MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_comment DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_comment ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_post MODIFY COLUMN post_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_post MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_post DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_post ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_rating MODIFY COLUMN rating_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_rating MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_rating DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_rating ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_rel_user MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_rel_user MODIFY COLUMN blog_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_rel_user MODIFY COLUMN user_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_rating DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_rating ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_task MODIFY COLUMN task_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_task MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_task DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_task ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_blog_task_rel_user MODIFY COLUMN blog_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_task_rel_user MODIFY COLUMN user_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_task_rel_user MODIFY COLUMN task_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_blog_task_rel_user DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_blog_task_rel_user ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_calendar_event_repeat MODIFY COLUMN cal_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_calendar_event_repeat_not MODIFY COLUMN cal_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat_not MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat_not DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_calendar_event_repeat_not ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_dropbox_category MODIFY COLUMN cat_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_category MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_category DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_dropbox_category ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_dropbox_feedback MODIFY COLUMN feedback_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_feedback MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_feedback DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_dropbox_feedback ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_dropbox_person MODIFY COLUMN file_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_person MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_person DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_dropbox_person ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_dropbox_post MODIFY COLUMN file_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_post MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_dropbox_post DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_dropbox_post ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_forum_category MODIFY COLUMN cat_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_category MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_category DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_forum_category ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_forum_forum MODIFY COLUMN forum_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_forum MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_forum DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_forum_forum ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_forum_post MODIFY COLUMN post_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_post MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_post DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_forum_post ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_forum_thread MODIFY COLUMN forum_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_thread MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_forum_thread DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_forum_thread ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_glossary MODIFY COLUMN glossary_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_glossary MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_glossary DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_glossary ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_notebook MODIFY COLUMN notebook_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_notebook MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_notebook DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_notebook ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_online_connected MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_online_connected DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_online_connected ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_quiz_answer MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_answer DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_quiz_answer MODIFY COLUMN id_auto int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_quiz_question_rel_category MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_question_rel_category MODIFY COLUMN question_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_question_rel_category DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_quiz_question_rel_category ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+
+        $this->addSql("ALTER TABLE session_rel_user MODIFY COLUMN id_session int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE session_rel_user MODIFY COLUMN id_user int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE session_rel_user DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE session_rel_user ADD COLUMN id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+
+
+
+        $this->addSql("ALTER TABLE c_quiz_rel_question MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_rel_question MODIFY COLUMN question_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_rel_question MODIFY COLUMN exercice_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_quiz_rel_question DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_quiz_rel_question ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_role MODIFY COLUMN role_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_role MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_role DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_role ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_role_user MODIFY COLUMN role_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_role_user MODIFY COLUMN user_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_role_user MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_role_user DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_role_user ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_survey MODIFY COLUMN survey_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_survey ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_survey_answer MODIFY COLUMN answer_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_answer MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_answer DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_survey_answer ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_survey_invitation MODIFY COLUMN survey_invitation_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_invitation MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_invitation DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_survey_invitation ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_survey_question MODIFY COLUMN question_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_question MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_question DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_survey_question ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_survey_question_option MODIFY COLUMN question_option_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_question_option MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_survey_question_option DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_survey_question_option ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
+        $this->addSql("ALTER TABLE c_wiki_conf MODIFY COLUMN page_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_wiki_conf MODIFY COLUMN c_id int unsigned DEFAULT NULL");
+        $this->addSql("ALTER TABLE c_wiki_conf DROP PRIMARY KEY");
+        $this->addSql("ALTER TABLE c_wiki_conf ADD COLUMN iid int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
+
         $this->addSql("ALTER TABLE session_rel_user MODIFY COLUMN relation_type int unsigned DEFAULT 0");
         $this->addSql("ALTER TABLE session_rel_user DROP PRIMARY KEY");
         $this->addSql("ALTER TABLE session_rel_user ADD COLUMN id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT");
diff --git a/src/Chamilo/CourseBundle/Entity/CAnnouncement.php b/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
index f8c508f09a..028ea00a8d 100644
--- a/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
+++ b/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -10,8 +11,31 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(name="c_announcement", indexes={@ORM\Index(name="session_id", columns={"session_id"})})
  * @ORM\Entity
  */
-class CAnnouncement
+class Announcement
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -54,26 +78,6 @@ class CAnnouncement
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php b/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
index c19abf975e..750f237021 100644
--- a/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -12,6 +13,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CAnnouncementAttachment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -47,26 +71,6 @@ class CAnnouncementAttachment
      */
     private $filename;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set path
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendance.php b/src/Chamilo/CourseBundle/Entity/CAttendance.php
index a6ec7a7ec9..907cb22189 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendance.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendance.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -12,6 +13,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CAttendance
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -68,26 +92,6 @@ class CAttendance
      */
     private $locked;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set name
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
index b2d50cf594..945957b750 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
@@ -15,43 +15,46 @@ class CAttendanceCalendar
     /**
      * @var integer
      *
-     * @ORM\Column(name="attendance_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $attendanceId;
+    private $iid;
 
     /**
-     * @var \DateTime
+     * @var integer
      *
-     * @ORM\Column(name="date_time", type="datetime", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $dateTime;
+    private $id;
 
     /**
-     * @var boolean
+     * @var integer
      *
-     * @ORM\Column(name="done_attendance", type="boolean", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $doneAttendance;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $id;
+    private $attendanceId;
 
     /**
-     * @var integer
+     * @var \DateTime
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="date_time", type="datetime", nullable=false)
      */
-    private $cId;
-
+    private $dateTime;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="done_attendance", type="boolean", nullable=false)
+     */
+    private $doneAttendance;
 
     /**
      * Set attendanceId
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
index 9af701a280..8070c186d7 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
@@ -15,34 +15,39 @@ class CAttendanceCalendarRelGroup
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $cId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="group_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $groupId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="calendar_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $calendarId;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $id;
-
+    private $groupId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="calendar_id", type="integer", nullable=false)
+     */
+    private $calendarId;
 
     /**
      * Set cId
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php b/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
index 62a0d19375..cf711188a2 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
@@ -15,43 +15,46 @@ class CAttendanceResult
     /**
      * @var integer
      *
-     * @ORM\Column(name="user_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $userId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="attendance_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $attendanceId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="score", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $score;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $id;
+    private $userId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $cId;
-
+    private $attendanceId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="score", type="integer", nullable=false)
+     */
+    private $score;
 
     /**
      * Set userId
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php b/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
index b13bb49b54..15743592b3 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -13,21 +14,28 @@ use Doctrine\ORM\Mapping as ORM;
 class CAttendanceSheet
 {
     /**
-     * @var boolean
+     * @var integer
      *
-     * @ORM\Column(name="presence", type="boolean", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $presence;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="presence", type="boolean", nullable=false)
+     */
+    private $presence;
+
     /**
      * @var integer
      *
@@ -46,8 +54,6 @@ class CAttendanceSheet
      */
     private $attendanceCalendarId;
 
-
-
     /**
      * Set presence
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php b/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
index 25fe2eb342..ac25cfeea6 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CAttendanceSheetLog
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var integer
      *
@@ -47,26 +70,6 @@ class CAttendanceSheetLog
      */
     private $calendarDateValue;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set attendanceId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlog.php b/src/Chamilo/CourseBundle/Entity/CBlog.php
index b5ef2192e6..d0425a92b0 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlog.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlog.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -12,6 +13,31 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlog
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="blog_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="NONE")
+     */
+    private $blogId;
+
     /**
      * @var string
      *
@@ -47,26 +73,6 @@ class CBlog
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="blog_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $blogId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set blogName
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php b/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
index a8a5f1bbee..cf3adcec51 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -12,6 +13,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlogAttachment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -61,25 +85,6 @@ class CBlogAttachment
      */
     private $commentId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
 
     /**
      * Set path
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogComment.php b/src/Chamilo/CourseBundle/Entity/CBlogComment.php
index 20e54e49c1..df5570162b 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogComment.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogComment.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlogComment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="comment_id", type="integer")
+     */
+    private $commentId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -68,26 +91,6 @@ class CBlogComment
      */
     private $parentCommentId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="comment_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $commentId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogPost.php b/src/Chamilo/CourseBundle/Entity/CBlogPost.php
index 21054b9468..37a1811d4c 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogPost.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlogPost
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="blog_id", type="integer", nullable=false)
+     */
+    private $blogId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -33,13 +56,6 @@ class CBlogPost
      */
     private $dateCreation;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="blog_id", type="integer", nullable=false)
-     */
-    private $blogId;
-
     /**
      * @var integer
      *
@@ -51,22 +67,9 @@ class CBlogPost
      * @var integer
      *
      * @ORM\Column(name="post_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $postId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogRating.php b/src/Chamilo/CourseBundle/Entity/CBlogRating.php
index 4b0b490c03..06a97d5d5a 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogRating.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogRating.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlogRating
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="rating_id", type="integer")
+     */
+    private $ratingId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var integer
      *
@@ -47,26 +70,6 @@ class CBlogRating
      */
     private $rating;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="rating_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $ratingId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set blogId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php b/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
index 3b54a9e115..56dc265f05 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
@@ -15,9 +15,16 @@ class CBlogRelUser
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
+     * @ORM\Column(name="iid", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
      */
     private $cId;
 
@@ -25,8 +32,6 @@ class CBlogRelUser
      * @var integer
      *
      * @ORM\Column(name="blog_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $blogId;
 
@@ -34,13 +39,10 @@ class CBlogRelUser
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
 
-
     /**
      * Set cId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogTask.php b/src/Chamilo/CourseBundle/Entity/CBlogTask.php
index a5b4469dd5..915f2ea72f 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogTask.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogTask.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CBlogTask
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="task_id", type="integer")
+     */
+    private $taskId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var integer
      *
@@ -47,25 +70,6 @@ class CBlogTask
      */
     private $systemTask;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="task_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $taskId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
 
     /**
      * Set blogId
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php b/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
index d246821194..43edb9e07e 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
@@ -13,27 +13,32 @@ use Doctrine\ORM\Mapping as ORM;
 class CBlogTaskRelUser
 {
     /**
-     * @var \DateTime
+     * @var integer
      *
-     * @ORM\Column(name="target_date", type="date", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $targetDate;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="target_date", type="date", nullable=false)
+     */
+    private $targetDate;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="blog_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $blogId;
 
@@ -41,8 +46,6 @@ class CBlogTaskRelUser
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
@@ -50,13 +53,9 @@ class CBlogTaskRelUser
      * @var integer
      *
      * @ORM\Column(name="task_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $taskId;
 
-
-
     /**
      * Set targetDate
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php b/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
index a8d96aeeb0..1df6aa4b14 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
@@ -12,6 +12,28 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CCalendarEvent
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
     /**
      * @var string
      *
@@ -61,26 +83,6 @@ class CCalendarEvent
      */
     private $allDay;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
index b0028b1e15..d99becf305 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CCalendarEventAttachment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -47,26 +70,6 @@ class CCalendarEventAttachment
      */
     private $filename;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set path
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
index 0c8490361f..04cb685a6a 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
@@ -13,52 +13,56 @@ use Doctrine\ORM\Mapping as ORM;
 class CCalendarEventRepeat
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="cal_type", type="string", length=20, nullable=true)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $calType;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="cal_end", type="integer", nullable=true)
+     * @ORM\Column(name="cal_id", type="integer")
      */
-    private $calEnd;
+    private $calId;
+
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="cal_frequency", type="integer", nullable=true)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $calFrequency;
+    private $cId;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="cal_days", type="string", length=7, nullable=true)
+     * @ORM\Column(name="cal_type", type="string", length=20, nullable=true)
      */
-    private $calDays;
+    private $calType;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="cal_end", type="integer", nullable=true)
      */
-    private $cId;
+    private $calEnd;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="cal_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="cal_frequency", type="integer", nullable=true)
      */
-    private $calId;
-
+    private $calFrequency;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="cal_days", type="string", length=7, nullable=true)
+     */
+    private $calDays;
 
     /**
      * Set calType
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
index be5ed0f22f..c82242b27e 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -15,9 +16,16 @@ class CCalendarEventRepeatNot
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
+     * @ORM\Column(name="iid", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
      */
     private $cId;
 
@@ -25,8 +33,6 @@ class CCalendarEventRepeatNot
      * @var integer
      *
      * @ORM\Column(name="cal_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $calId;
 
diff --git a/src/Chamilo/CourseBundle/Entity/CChatConnected.php b/src/Chamilo/CourseBundle/Entity/CChatConnected.php
index 70095b3203..ff03750b52 100644
--- a/src/Chamilo/CourseBundle/Entity/CChatConnected.php
+++ b/src/Chamilo/CourseBundle/Entity/CChatConnected.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Entity;
 
@@ -15,34 +16,40 @@ class CChatConnected
     /**
      * @var integer
      *
-     * @ORM\Column(name="session_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $sessionId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="to_group_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $toGroupId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $id;
+    private $cId;
+
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $sessionId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="to_group_id", type="integer", nullable=false)
+     */
+    private $toGroupId;
 
     /**
      * @var integer
diff --git a/src/Chamilo/CourseBundle/Entity/CCourseDescription.php b/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
index 5827fbf767..cb070ace67 100644
--- a/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
+++ b/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CCourseDescription
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -47,25 +70,6 @@ class CCourseDescription
      */
     private $progress;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
 
     /**
      * Set title
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php b/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
index db8c5cfb30..e7ba94260b 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CDropboxCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="cat_id", type="integer")
+     */
+    private $catId;
+
     /**
      * @var string
      *
@@ -47,25 +70,6 @@ class CDropboxCategory
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="cat_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $catId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
 
     /**
      * Set catName
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php b/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
index 5e56d28267..85b91e67df 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
@@ -15,49 +15,53 @@ class CDropboxFeedback
     /**
      * @var integer
      *
-     * @ORM\Column(name="file_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $fileId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="author_user_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $authorUserId;
+    private $cId;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="feedback", type="text", nullable=false)
+     * @ORM\Column(name="feedback_id", type="integer")
      */
-    private $feedback;
+    private $feedbackId;
 
     /**
-     * @var \DateTime
+     * @var integer
      *
-     * @ORM\Column(name="feedback_date", type="datetime", nullable=false)
+     * @ORM\Column(name="file_id", type="integer", nullable=false)
      */
-    private $feedbackDate;
+    private $fileId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="feedback_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="author_user_id", type="integer", nullable=false)
      */
-    private $feedbackId;
+    private $authorUserId;
 
     /**
-     * @var integer
+     * @var string
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="feedback", type="text", nullable=false)
      */
-    private $cId;
+    private $feedback;
 
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="feedback_date", type="datetime", nullable=false)
+     */
+    private $feedbackDate;
 
 
     /**
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxFile.php b/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
index 331634cca1..3e7f656160 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CDropboxFile
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var integer
      *
@@ -82,26 +105,6 @@ class CDropboxFile
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set uploaderId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php b/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
index 5eb45f16c8..a949505756 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
@@ -15,9 +15,16 @@ class CDropboxPerson
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
+     * @ORM\Column(name="iid", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
      */
     private $cId;
 
@@ -25,8 +32,6 @@ class CDropboxPerson
      * @var integer
      *
      * @ORM\Column(name="file_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $fileId;
 
@@ -34,13 +39,10 @@ class CDropboxPerson
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
 
-
     /**
      * Set cId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxPost.php b/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
index f20ef71b76..88ce265ada 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
@@ -12,6 +12,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CDropboxPost
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
     /**
      * @var \DateTime
      *
@@ -44,8 +53,6 @@ class CDropboxPost
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
@@ -53,8 +60,6 @@ class CDropboxPost
      * @var integer
      *
      * @ORM\Column(name="file_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $fileId;
 
@@ -62,13 +67,10 @@ class CDropboxPost
      * @var integer
      *
      * @ORM\Column(name="dest_user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $destUserId;
 
 
-
     /**
      * Set feedbackDate
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumAttachment.php b/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
index cdc3fb36ec..4cb87aeeae 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumAttachment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -47,26 +70,6 @@ class CForumAttachment
      */
     private $filename;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set path
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumCategory.php b/src/Chamilo/CourseBundle/Entity/CForumCategory.php
index 434b41bad7..2de40b9333 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumCategory.php
@@ -12,6 +12,22 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -51,22 +67,9 @@ class CForumCategory
      * @var integer
      *
      * @ORM\Column(name="cat_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $catId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set catTitle
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumForum.php b/src/Chamilo/CourseBundle/Entity/CForumForum.php
index 7c8678a41b..89db1a5ea9 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumForum.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumForum.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumForum
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="forum_id", type="integer")
+     */
+    private $forumId;
+
     /**
      * @var string
      *
@@ -152,26 +175,6 @@ class CForumForum
      */
     private $endTime;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="forum_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $forumId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set forumTitle
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumMailcue.php b/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
index 237773f2a9..f378347e2f 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
@@ -15,27 +15,30 @@ class CForumMailcue
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
+     * @ORM\Column(name="iid", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\GeneratedValue
      */
-    private $id;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="thread_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $threadId;
 
@@ -43,8 +46,6 @@ class CForumMailcue
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
@@ -52,13 +53,10 @@ class CForumMailcue
      * @var integer
      *
      * @ORM\Column(name="post_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $postId;
 
 
-
     /**
      * Set id
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumNotification.php b/src/Chamilo/CourseBundle/Entity/CForumNotification.php
index 3cd56c4a58..fa767f5c36 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumNotification.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumNotification.php
@@ -15,27 +15,30 @@ class CForumNotification
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
+     * @ORM\Column(name="iid", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\GeneratedValue
      */
-    private $id;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
@@ -43,8 +46,6 @@ class CForumNotification
      * @var integer
      *
      * @ORM\Column(name="forum_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $forumId;
 
@@ -52,8 +53,6 @@ class CForumNotification
      * @var integer
      *
      * @ORM\Column(name="thread_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $threadId;
 
@@ -61,13 +60,9 @@ class CForumNotification
      * @var integer
      *
      * @ORM\Column(name="post_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $postId;
 
-
-
     /**
      * Set id
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumPost.php b/src/Chamilo/CourseBundle/Entity/CForumPost.php
index 13653f0027..da8ca254b4 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumPost.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumPost
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="post_id", type="integer")
+     */
+    private $postId;
+
     /**
      * @var string
      *
@@ -82,26 +105,6 @@ class CForumPost
      */
     private $visible;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="post_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $postId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set postTitle
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThread.php b/src/Chamilo/CourseBundle/Entity/CForumThread.php
index d9ae1f9f32..a05fb52cfe 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThread.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThread.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumThread
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="thread_id", type="integer")
+     */
+    private $threadId;
+
     /**
      * @var string
      *
@@ -116,27 +139,6 @@ class CForumThread
      * @ORM\Column(name="thread_weight", type="float", precision=6, scale=2, nullable=false)
      */
     private $threadWeight;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="thread_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $threadId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set threadTitle
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php b/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
index 423003a6c2..deed828658 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumThreadQualify
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -54,26 +77,6 @@ class CForumThreadQualify
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php b/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
index e550252766..e8be4085c0 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
@@ -12,6 +12,31 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CForumThreadQualifyLog
 {
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var integer
      *
@@ -54,26 +79,6 @@ class CForumThreadQualifyLog
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CGlossary.php b/src/Chamilo/CourseBundle/Entity/CGlossary.php
index 04f9ec12c5..f988825ca5 100644
--- a/src/Chamilo/CourseBundle/Entity/CGlossary.php
+++ b/src/Chamilo/CourseBundle/Entity/CGlossary.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CGlossary
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="glossary_id", type="integer")
+     */
+    private $glossaryId;
+
     /**
      * @var string
      *
@@ -40,26 +63,6 @@ class CGlossary
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="glossary_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $glossaryId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set name
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupCategory.php b/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
index 078e6bd9db..dca0cf2be7 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CGroupCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var string
      *
@@ -110,26 +134,6 @@ class CGroupCategory
      */
     private $displayOrder;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php b/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
index 12cb107c42..548bfc132e 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
@@ -15,36 +15,39 @@ class CGroupRelTutor
     /**
      * @var integer
      *
-     * @ORM\Column(name="user_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $userId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="group_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $groupId;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $cId;
-
+    private $userId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="group_id", type="integer", nullable=false)
+     */
+    private $groupId;
 
     /**
      * Set userId
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php b/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
index b2bf788a69..21e245320e 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
@@ -15,50 +15,54 @@ class CGroupRelUser
     /**
      * @var integer
      *
-     * @ORM\Column(name="user_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $userId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="group_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $groupId;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="status", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $status;
+    private $id;
+
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="role", type="string", length=50, nullable=false)
+     * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $role;
+    private $userId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $id;
+    private $groupId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="status", type="integer", nullable=false)
      */
-    private $cId;
-
+    private $status;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="role", type="string", length=50, nullable=false)
+     */
+    private $role;
 
     /**
      * Set userId
diff --git a/src/Chamilo/CourseBundle/Entity/CLink.php b/src/Chamilo/CourseBundle/Entity/CLink.php
index 23482d2e3b..0d128e0025 100644
--- a/src/Chamilo/CourseBundle/Entity/CLink.php
+++ b/src/Chamilo/CourseBundle/Entity/CLink.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLink
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -68,26 +91,6 @@ class CLink
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set url
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLinkCategory.php b/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
index 3edd7a6905..9bbf238e12 100644
--- a/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLinkCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var string
      *
@@ -40,26 +64,6 @@ class CLinkCategory
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set categoryTitle
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLp.php b/src/Chamilo/CourseBundle/Entity/CLp.php
index 7aae53c05a..051a529735 100644
--- a/src/Chamilo/CourseBundle/Entity/CLp.php
+++ b/src/Chamilo/CourseBundle/Entity/CLp.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLp
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var integer
      *
@@ -208,26 +232,6 @@ class CLp
      */
     private $expiredOn;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set lpType
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLpItem.php b/src/Chamilo/CourseBundle/Entity/CLpItem.php
index 815b14b72f..8ac18902e8 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpItem.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpItem.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLpItem
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -166,26 +189,6 @@ class CLpItem
      */
     private $prerequisiteMaxScore;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set lpId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLpItemView.php b/src/Chamilo/CourseBundle/Entity/CLpItemView.php
index 971b4555fd..f531aac6aa 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpItemView.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpItemView.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLpItemView
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -89,26 +112,6 @@ class CLpItemView
      */
     private $maxScore;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="bigint")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set lpItemId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php b/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
index 01927d5af9..c2ef6f785d 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLpIvInteraction
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -82,26 +105,6 @@ class CLpIvInteraction
      */
     private $latency;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="bigint")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set orderId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php b/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
index e5ff03d6cf..a3c74ebe4e 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLpIvObjective
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -61,26 +84,6 @@ class CLpIvObjective
      */
     private $status;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="bigint")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set lpIvId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CLpView.php b/src/Chamilo/CourseBundle/Entity/CLpView.php
index 04961ac1c3..f602f38956 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpView.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpView.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CLpView
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -54,26 +77,6 @@ class CLpView
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set lpId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CNotebook.php b/src/Chamilo/CourseBundle/Entity/CNotebook.php
index f3307c96d4..81f4dc9eb5 100644
--- a/src/Chamilo/CourseBundle/Entity/CNotebook.php
+++ b/src/Chamilo/CourseBundle/Entity/CNotebook.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CNotebook
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="notebook_id", type="integer")
+     */
+    private $notebookId;
+
     /**
      * @var integer
      *
@@ -68,26 +91,6 @@ class CNotebook
      */
     private $status;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="notebook_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $notebookId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/COnlineConnected.php b/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
index 2381d5d000..0d70201e00 100644
--- a/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
+++ b/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
@@ -13,32 +13,35 @@ use Doctrine\ORM\Mapping as ORM;
 class COnlineConnected
 {
     /**
-     * @var \DateTime
+     * @var integer
      *
-     * @ORM\Column(name="last_connection", type="datetime", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $lastConnection;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="last_connection", type="datetime", nullable=false)
+     */
+    private $lastConnection;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
-
-
     /**
      * Set lastConnection
      *
diff --git a/src/Chamilo/CourseBundle/Entity/COnlineLink.php b/src/Chamilo/CourseBundle/Entity/COnlineLink.php
index 5580e31846..8c6601a149 100644
--- a/src/Chamilo/CourseBundle/Entity/COnlineLink.php
+++ b/src/Chamilo/CourseBundle/Entity/COnlineLink.php
@@ -13,38 +13,42 @@ use Doctrine\ORM\Mapping as ORM;
 class COnlineLink
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="name", type="string", length=50, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $name;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="url", type="string", length=100, nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $url;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
-     * @var integer
+     * @var string
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="name", type="string", length=50, nullable=false)
      */
-    private $cId;
-
+    private $name;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="url", type="string", length=100, nullable=false)
+     */
+    private $url;
 
     /**
      * Set name
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php b/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
index 43e7ad6557..6c9604bbf2 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
@@ -15,43 +15,47 @@ class CPermissionGroup
     /**
      * @var integer
      *
-     * @ORM\Column(name="group_id", type="integer", nullable=false)
-     */
-    private $groupId;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $tool;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $action;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $groupId;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
+     */
+    private $tool;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     */
+    private $action;
 
     /**
      * Set groupId
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionTask.php b/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
index a8cea5d555..b13a54b57b 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
@@ -15,43 +15,46 @@ class CPermissionTask
     /**
      * @var integer
      *
-     * @ORM\Column(name="task_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $taskId;
+    private $iid;
 
     /**
-     * @var string
-     *
-     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
-     */
-    private $tool;
-
-    /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $action;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="task_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $taskId;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
+     */
+    private $tool;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     */
+    private $action;
 
     /**
      * Set taskId
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionUser.php b/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
index 7979d57d93..d3ab4d801d 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
@@ -15,43 +15,47 @@ class CPermissionUser
     /**
      * @var integer
      *
-     * @ORM\Column(name="user_id", type="integer", nullable=false)
-     */
-    private $userId;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $tool;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $action;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $userId;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="tool", type="string", length=250, nullable=false)
+     */
+    private $tool;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="action", type="string", length=250, nullable=false)
+     */
+    private $action;
 
     /**
      * Set userId
diff --git a/src/Chamilo/CourseBundle/Entity/CQuiz.php b/src/Chamilo/CourseBundle/Entity/CQuiz.php
index 6dcc9dcb1c..b6fb1025a8 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuiz.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuiz.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CQuiz
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var string
      *
@@ -159,26 +183,6 @@ class CQuiz
      */
     private $passPercentage;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php b/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
index 03d88422c0..941be6cefc 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
@@ -15,7 +15,23 @@ class CQuizAnswer
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Column(name="id_auto", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $idAuto;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
      */
     private $id;
 
@@ -89,25 +105,6 @@ class CQuizAnswer
      */
     private $answerCode;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id_auto", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $idAuto;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
 
     /**
      * Set id
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
index c6fbd707fe..4c7b0c23ba 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CQuizQuestion
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -75,26 +98,6 @@ class CQuizQuestion
      */
     private $questionCode;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set question
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
index 5838685829..fb7e83aa4d 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
@@ -13,38 +13,41 @@ use Doctrine\ORM\Mapping as ORM;
 class CQuizQuestionCategory
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="title", type="string", length=255, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $title;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="description", type="text", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $description;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
     /**
-     * @var integer
+     * @var string
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $cId;
-
+    private $title;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="description", type="text", nullable=false)
+     */
+    private $description;
 
     /**
      * Set title
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
index 63f6767e7d..5855f6d000 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
@@ -15,43 +15,47 @@ class CQuizQuestionOption
     /**
      * @var integer
      *
-     * @ORM\Column(name="question_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $questionId;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="name", type="string", length=255, nullable=true)
-     */
-    private $name;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="position", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $position;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $questionId;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", length=255, nullable=true)
+     */
+    private $name;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="position", type="integer", nullable=false)
+     */
+    private $position;
 
     /**
      * Set questionId
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
index 9693701501..09f435e517 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
@@ -15,30 +15,33 @@ class CQuizQuestionRelCategory
     /**
      * @var integer
      *
-     * @ORM\Column(name="category_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $categoryId;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="category_id", type="integer", nullable=false)
+     */
+    private $categoryId;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="question_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $questionId;
 
-
-
     /**
      * Set categoryId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php b/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
index 3ae97b2f55..579b4daf1a 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
@@ -15,25 +15,30 @@ class CQuizRelQuestion
     /**
      * @var integer
      *
-     * @ORM\Column(name="question_order", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $questionOrder;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="question_order", type="integer", nullable=false)
+     */
+    private $questionOrder;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="question_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $questionId;
 
@@ -41,13 +46,9 @@ class CQuizRelQuestion
      * @var integer
      *
      * @ORM\Column(name="exercice_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $exerciceId;
 
-
-
     /**
      * Set questionOrder
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CResource.php b/src/Chamilo/CourseBundle/Entity/CResource.php
index 6769ba2a91..71d6a4ee8d 100644
--- a/src/Chamilo/CourseBundle/Entity/CResource.php
+++ b/src/Chamilo/CourseBundle/Entity/CResource.php
@@ -13,52 +13,56 @@ use Doctrine\ORM\Mapping as ORM;
 class CResource
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="source_type", type="string", length=50, nullable=true)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $sourceType;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="source_id", type="integer", nullable=true)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $sourceId;
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
 
     /**
      * @var string
      *
-     * @ORM\Column(name="resource_type", type="string", length=50, nullable=true)
+     * @ORM\Column(name="source_type", type="string", length=50, nullable=true)
      */
-    private $resourceType;
+    private $sourceType;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="resource_id", type="integer", nullable=true)
+     * @ORM\Column(name="source_id", type="integer", nullable=true)
      */
-    private $resourceId;
+    private $sourceId;
 
     /**
-     * @var integer
+     * @var string
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="resource_type", type="string", length=50, nullable=true)
      */
-    private $id;
+    private $resourceType;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="resource_id", type="integer", nullable=true)
      */
-    private $cId;
-
-
+    private $resourceId;
 
     /**
      * Set sourceType
diff --git a/src/Chamilo/CourseBundle/Entity/CRole.php b/src/Chamilo/CourseBundle/Entity/CRole.php
index 574a64d1a6..f0257fc1d4 100644
--- a/src/Chamilo/CourseBundle/Entity/CRole.php
+++ b/src/Chamilo/CourseBundle/Entity/CRole.php
@@ -12,6 +12,22 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CRole
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
     /**
      * @var string
      *
@@ -37,22 +53,9 @@ class CRole
      * @var integer
      *
      * @ORM\Column(name="role_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $roleId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set roleName
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CRoleGroup.php b/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
index b120bdf3e5..6febceb92f 100644
--- a/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
@@ -15,46 +15,49 @@ class CRoleGroup
     /**
      * @var integer
      *
-     * @ORM\Column(name="role_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $roleId;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="scope", type="string", length=20, nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $scope;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="role_id", type="integer", nullable=false)
      */
-    private $cId;
+    private $roleId;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="scope", type="string", length=20, nullable=false)
+     */
+    private $scope;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="group_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $groupId;
 
 
-
     /**
      * Set roleId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CRolePermissions.php b/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
index 95ff89d9fb..82ef79c293 100644
--- a/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
+++ b/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
@@ -13,36 +13,40 @@ use Doctrine\ORM\Mapping as ORM;
 class CRolePermissions
 {
     /**
-     * @var boolean
+     * @var integer
      *
-     * @ORM\Column(name="default_perm", type="boolean", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $defaultPerm;
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
-     * @var integer
+     * @var boolean
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="default_perm", type="boolean", nullable=false)
      */
-    private $cId;
+    private $defaultPerm;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="role_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $roleId;
 
@@ -50,8 +54,6 @@ class CRolePermissions
      * @var string
      *
      * @ORM\Column(name="tool", type="string", length=250)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $tool;
 
@@ -59,13 +61,9 @@ class CRolePermissions
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=50)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $action;
 
-
-
     /**
      * Set defaultPerm
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CRoleUser.php b/src/Chamilo/CourseBundle/Entity/CRoleUser.php
index 4535568b9d..01cb65bc56 100644
--- a/src/Chamilo/CourseBundle/Entity/CRoleUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CRoleUser.php
@@ -13,27 +13,32 @@ use Doctrine\ORM\Mapping as ORM;
 class CRoleUser
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="scope", type="string", length=20, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $scope;
+    private $iid;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $cId;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="scope", type="string", length=20, nullable=false)
+     */
+    private $scope;
+
     /**
      * @var integer
      *
      * @ORM\Column(name="role_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $roleId;
 
@@ -41,13 +46,9 @@ class CRoleUser
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
-
-
     /**
      * Set scope
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublication.php b/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
index ece1440956..2aac172028 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CStudentPublication
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -152,26 +175,6 @@ class CStudentPublication
      */
     private $containsFile;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set url
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
index 6ed4c414f2..e3eae37ba7 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CStudentPublicationAssignment
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var \DateTime
      *
@@ -47,26 +70,6 @@ class CStudentPublicationAssignment
      */
     private $publicationId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set expiresOn
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
index 6acc253780..697cbb3ed9 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
@@ -15,17 +15,34 @@ class CStudentPublicationComment
     /**
      * @var integer
      *
-     * @ORM\Column(name="work_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $workId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
     private $cId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="work_id", type="integer", nullable=false)
+     */
+    private $workId;
+
     /**
      * @var string
      *
@@ -54,17 +71,6 @@ class CStudentPublicationComment
      */
     private $sentAt;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set workId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
index 1bb92a48a9..20e84b0ba2 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
@@ -15,34 +15,40 @@ class CStudentPublicationRelDocument
     /**
      * @var integer
      *
-     * @ORM\Column(name="work_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $workId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="document_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $documentId;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $cId;
+    private $id;
+
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\Column(name="work_id", type="integer", nullable=false)
      */
-    private $id;
-
+    private $workId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="document_id", type="integer", nullable=false)
+     */
+    private $documentId;
 
     /**
      * Set workId
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
index 861539e46a..08e2b44c1a 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
@@ -15,34 +15,39 @@ class CStudentPublicationRelUser
     /**
      * @var integer
      *
-     * @ORM\Column(name="work_id", type="integer", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $workId;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="user_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $userId;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $cId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\Column(name="work_id", type="integer", nullable=false)
      */
-    private $id;
-
+    private $workId;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="user_id", type="integer", nullable=false)
+     */
+    private $userId;
 
     /**
      * Set workId
diff --git a/src/Chamilo/CourseBundle/Entity/CSurvey.php b/src/Chamilo/CourseBundle/Entity/CSurvey.php
index 54e0fbbea6..ed8344535a 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurvey.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurvey.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CSurvey
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="survey_id", type="integer")
+     */
+    private $surveyId;
+
     /**
      * @var string
      *
@@ -208,26 +231,6 @@ class CSurvey
      */
     private $visibleResults;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="survey_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $surveyId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set code
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php b/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
index 11e999535b..a31ec63617 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CSurveyAnswer
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="answer_id", type="integer")
+     */
+    private $answerId;
+
     /**
      * @var integer
      *
@@ -47,26 +70,6 @@ class CSurveyAnswer
      */
     private $user;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="answer_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $answerId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set surveyId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php b/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
index 665b06d1d4..97de97d16d 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
@@ -13,45 +13,49 @@ use Doctrine\ORM\Mapping as ORM;
 class CSurveyGroup
 {
     /**
-     * @var string
-     *
-     * @ORM\Column(name="name", type="string", length=20, nullable=false)
-     */
-    private $name;
-
-    /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="description", type="string", length=255, nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $description;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="survey_id", type="integer", nullable=false)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $surveyId;
+    private $cId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $id;
 
+
     /**
-     * @var integer
+     * @var string
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="name", type="string", length=20, nullable=false)
      */
-    private $cId;
+    private $name;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="description", type="string", length=255, nullable=false)
+     */
+    private $description;
 
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="survey_id", type="integer", nullable=false)
+     */
+    private $surveyId;
 
     /**
      * Set name
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php b/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
index 753bbb94ce..14d7d1c42a 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
@@ -12,6 +12,31 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CSurveyInvitation
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="survey_invitation_id", type="integer")
+     */
+    private $surveyInvitationId;
+
+
     /**
      * @var string
      *
@@ -68,26 +93,6 @@ class CSurveyInvitation
      */
     private $groupId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="survey_invitation_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $surveyInvitationId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set surveyCode
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php b/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
index 91070bef9c..c3e36cb447 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CSurveyQuestion
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="question_id", type="integer")
+     */
+    private $questionId;
+
     /**
      * @var integer
      *
@@ -89,26 +112,6 @@ class CSurveyQuestion
      */
     private $surveyGroupSec2;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="question_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $questionId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set surveyId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php b/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
index c049060bf9..efde238ded 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CSurveyQuestionOption
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="question_option_id", type="integer")
+     */
+    private $questionOptionId;
+
     /**
      * @var integer
      *
@@ -47,26 +70,6 @@ class CSurveyQuestionOption
      */
     private $value;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="question_option_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $questionOptionId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set questionId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CThematic.php b/src/Chamilo/CourseBundle/Entity/CThematic.php
index fe8636a244..bca20da925 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematic.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematic.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CThematic
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -47,26 +70,6 @@ class CThematic
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php b/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
index 302a209ada..d07c21a798 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CThematicAdvance
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -54,26 +77,6 @@ class CThematicAdvance
      */
     private $doneAdvance;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set thematicId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CThematicPlan.php b/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
index e08a6c0a93..cc28ca04a0 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CThematicPlan
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var integer
      *
@@ -40,26 +64,6 @@ class CThematicPlan
      */
     private $descriptionType;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set thematicId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CTool.php b/src/Chamilo/CourseBundle/Entity/CTool.php
index 30d0669af9..c345c07ff8 100644
--- a/src/Chamilo/CourseBundle/Entity/CTool.php
+++ b/src/Chamilo/CourseBundle/Entity/CTool.php
@@ -26,7 +26,6 @@ class CTool
      * @var integer
      *
      * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
      */
     private $id;
 
@@ -34,7 +33,6 @@ class CTool
      * @var integer
      *
      * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
      */
     private $cId;
 
@@ -108,9 +106,6 @@ class CTool
      */
     private $sessionId;
 
-
-
-
     /**
      * Set name
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CToolIntro.php b/src/Chamilo/CourseBundle/Entity/CToolIntro.php
index 03b8319ced..a2a1a41ae2 100644
--- a/src/Chamilo/CourseBundle/Entity/CToolIntro.php
+++ b/src/Chamilo/CourseBundle/Entity/CToolIntro.php
@@ -13,41 +13,43 @@ use Doctrine\ORM\Mapping as ORM;
 class CToolIntro
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="intro_text", type="text", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $introText;
+    private $iid;
 
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="id", type="string", length=50)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $id;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="id", type="integer")
      */
-    private $cId;
+    private $id;
+
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="intro_text", type="text", nullable=false)
+     */
+    private $introText;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="session_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $sessionId;
 
-
-
     /**
      * Set introText
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php b/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
index 0c62890d8f..09dd75787c 100644
--- a/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
+++ b/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CUserinfoContent
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -47,26 +70,6 @@ class CUserinfoContent
      */
     private $content;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php b/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
index 09234f2b0b..4f669b380a 100644
--- a/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
+++ b/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CUserinfoDef
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -40,26 +63,6 @@ class CUserinfoDef
      */
     private $rank;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set title
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CWiki.php b/src/Chamilo/CourseBundle/Entity/CWiki.php
index 7e1c881df4..8f584d3986 100644
--- a/src/Chamilo/CourseBundle/Entity/CWiki.php
+++ b/src/Chamilo/CourseBundle/Entity/CWiki.php
@@ -12,6 +12,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CWiki
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -187,26 +210,6 @@ class CWiki
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set pageId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiConf.php b/src/Chamilo/CourseBundle/Entity/CWikiConf.php
index 90120d2d8b..7274336985 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiConf.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiConf.php
@@ -12,6 +12,32 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CWikiConf
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="page_id", type="integer")
+     */
+    private $pageId;
+
+
+
     /**
      * @var string
      *
@@ -103,24 +129,6 @@ class CWikiConf
      */
     private $delayedsubmit;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="page_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $pageId;
-
 
 
     /**
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php b/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
index 8d4381a063..699541768c 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
@@ -12,6 +12,30 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CWikiDiscuss
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $iid;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="c_id", type="integer")
+     */
+    private $cId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     */
+    private $id;
+
+
     /**
      * @var integer
      *
@@ -47,26 +71,6 @@ class CWikiDiscuss
      */
     private $dtime;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $cId;
-
-
-
     /**
      * Set publicationId
      *
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php b/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
index 1f88750823..f4bb9e41ef 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
@@ -13,55 +13,57 @@ use Doctrine\ORM\Mapping as ORM;
 class CWikiMailcue
 {
     /**
-     * @var string
+     * @var integer
      *
-     * @ORM\Column(name="type", type="text", nullable=false)
+     * @ORM\Column(name="iid", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $type;
+    private $iid;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="group_id", type="integer", nullable=true)
+     * @ORM\Column(name="c_id", type="integer")
      */
-    private $groupId;
+    private $cId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="session_id", type="integer", nullable=true)
+     * @ORM\Column(name="id", type="integer")
      */
-    private $sessionId;
+    private $id;
+
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="type", type="text", nullable=false)
+     */
+    private $type;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="c_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="group_id", type="integer", nullable=true)
      */
-    private $cId;
+    private $groupId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
+     * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $id;
+    private $sessionId;
 
     /**
      * @var integer
      *
      * @ORM\Column(name="user_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $userId;
 
-
-
     /**
      * Set type
      *