diff --git a/main/install/data.sql b/main/install/data.sql
index ba16737e96..2055d2ac8a 100644
--- a/main/install/data.sql
+++ b/main/install/data.sql
@@ -740,30 +740,32 @@ INSERT INTO course_module VALUES
 (29,'attendance','attendance/index.php','attendance.gif',2,1,'basic'),
 (30,'course_progress','course_progress/index.php','course_progress.gif',2,1,'basic');
 
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'legal_accept','Legal',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'already_logged_in','Already logged in',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'update_type','Update script type',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (10, 'tags','tags',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'rssfeeds','RSS',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'dashboard', 'Dashboard', 0, 0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (11, 'timezone', 'Timezone', 0, 0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_invitation',   'MailNotifyInvitation',1,1,'1');
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_message',      'MailNotifyMessage',1,1,'1');
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_group_message','MailNotifyGroupMessage',1,1,'1');
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'user_chat_status','User chat status',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES (1, 'google_calendar_url','Google Calendar URL',0,0);
-
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (8, '1', 'AtOnce',1);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (8, '8', 'Daily',2);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (8, '0', 'No',3);
-
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (9, '1', 'AtOnce',1);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (9, '8', 'Daily',2);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (9, '0', 'No',3);
-
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (10, '1', 'AtOnce',1);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (10, '8', 'Daily',2);
-INSERT INTO user_field_options (field_id, option_value, option_display_text, option_order) values (10, '0', 'No',3);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'legal_accept','Legal',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'already_logged_in','Already logged in',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'update_type','Update script type',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 10, 'tags','tags',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'rssfeeds','RSS',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'dashboard', 'Dashboard', 0, 0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 11, 'timezone', 'Timezone', 0, 0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, default_value) values (1, 4, 'mail_notify_invitation',   'MailNotifyInvitation',1,1,'1');
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, default_value) values (1, 4, 'mail_notify_message',      'MailNotifyMessage',1,1,'1');
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, default_value) values (1, 4, 'mail_notify_group_message','MailNotifyGroupMessage',1,1,'1');
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'user_chat_status','User chat status',0,0);
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable) VALUES (1, 1, 'google_calendar_url','Google Calendar URL',0,0);
+
+INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, default_value) VALUES (2, 1, 'special_course', 'Special course', 1 , 1, '');
+
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (8, '1', 'AtOnce',1);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (8, '8', 'Daily',2);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (8, '0', 'No',3);
+
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (9, '1', 'AtOnce',1);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (9, '8', 'Daily',2);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (9, '0', 'No',3);
+
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (10, '1', 'AtOnce',1);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (10, '8', 'Daily',2);
+INSERT INTO extra_field_options (field_id, option_value, option_display_text, option_order) VALUES (10, '0', 'No',3);
 
 INSERT INTO access_url(url, description, active, created_by) VALUES ('http://localhost/',' ',1,1);
 
@@ -1545,9 +1547,6 @@ VALUES
 (5,'SocialEnemy'),
 (6,'SocialDeleted');
 
-INSERT INTO course_field (field_type, field_variable, field_display_text, field_default_value, field_visible, field_changeable)
-VALUES (1, 'special_course', 'Special course', '', 1 , 1);
-
 INSERT INTO skill (name) VALUES ('Root');
 
 INSERT INTO skill_rel_skill VALUES(1, 1, 0, 0, 0);
diff --git a/src/Chamilo/CoreBundle/Entity/ExtraField.php b/src/Chamilo/CoreBundle/Entity/ExtraField.php
index cb61a96a13..808f2cef8d 100644
--- a/src/Chamilo/CoreBundle/Entity/ExtraField.php
+++ b/src/Chamilo/CoreBundle/Entity/ExtraField.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -104,11 +105,10 @@ class ExtraField extends BaseAttribute
      * @var \DateTime $created
      *
      * @Gedmo\Timestampable(on="create")
-     * @ORM\Column(type="datetime")
+     * @ORM\Column(name="created_at", type="datetime")
      */
     protected $createdAt;
 
-
     /**
      * Get id
      *
diff --git a/src/Chamilo/CoreBundle/Entity/ExtraFieldOptions.php b/src/Chamilo/CoreBundle/Entity/ExtraFieldOptions.php
index c5b49a5614..8f57786b53 100644
--- a/src/Chamilo/CoreBundle/Entity/ExtraFieldOptions.php
+++ b/src/Chamilo/CoreBundle/Entity/ExtraFieldOptions.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -26,7 +27,7 @@ class ExtraFieldOptions
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\ExtraField", inversedBy="options", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\ExtraField")
      * @ORM\JoinColumn(name="field_id", referencedColumnName="id")
      */
     protected $field;
@@ -36,22 +37,35 @@ class ExtraFieldOptions
      *
      * @ORM\Column(name="value", type="text", nullable=true)
      */
-    private $value;
+    protected $value;
 
     /**
      * @var string
      *
      * @ORM\Column(name="display_text", type="string", length=64, nullable=true)
      */
-    private $displayText;
+    protected $displayText;
 
     /**
-     * @var integer
+     * @var string
+     *
+     * @ORM\Column(name="priority", type="string", length=255, nullable=true)
+     */
+    protected $priority;
+
+    /**
+     * @var string
      *
-     * @ORM\Column(name="optionOrder", type="integer", nullable=true)
+     * @ORM\Column(name="priority_message", type="string", length=255, nullable=true)
      */
-    private $optionOrder;
+    protected $priorityMessage;
 
+     /**
+     * @var integer
+     *
+     * @ORM\Column(name="option_order", type="integer", nullable=true)
+     */
+    protected $optionOrder;
 
     /**
      * @return int
@@ -71,18 +85,14 @@ class ExtraFieldOptions
 
     /**
      * @param int $optionOrder
+     *
+     * @return $this
      */
     public function setOptionOrder($optionOrder)
     {
         $this->optionOrder = $optionOrder;
-    }
 
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
+        return $this;
     }
 
     /**
@@ -95,10 +105,14 @@ class ExtraFieldOptions
 
     /**
      * @param mixed $field
+     *
+     * @return $this
      */
     public function setField($field)
     {
         $this->field = $field;
+
+        return $this;
     }
 
     /**
@@ -111,10 +125,14 @@ class ExtraFieldOptions
 
     /**
      * @param string $value
+     *
+     * @return $this
      */
     public function setValue($value)
     {
         $this->value = $value;
+
+        return $this;
     }
 
     /**
@@ -127,9 +145,54 @@ class ExtraFieldOptions
 
     /**
      * @param string $displayText
+     *
+     * @return $this
      */
     public function setDisplayText($displayText)
     {
         $this->displayText = $displayText;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @param string $priority
+     *
+     * @return ExtraFieldOptions
+     */
+    public function setPriority($priority)
+    {
+        $this->priority = $priority;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPriorityMessage()
+    {
+        return $this->priorityMessage;
+    }
+
+    /**
+     * @param string $priorityMessage
+     *
+     * @return ExtraFieldOptions
+     */
+    public function setPriorityMessage($priorityMessage)
+    {
+        $this->priorityMessage = $priorityMessage;
+
+        return $this;
     }
+
 }
diff --git a/src/Chamilo/CoreBundle/Entity/ExtraFieldValues.php b/src/Chamilo/CoreBundle/Entity/ExtraFieldValues.php
index 85f52aedaa..9e89f5582b 100644
--- a/src/Chamilo/CoreBundle/Entity/ExtraFieldValues.php
+++ b/src/Chamilo/CoreBundle/Entity/ExtraFieldValues.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -31,10 +32,10 @@ class ExtraFieldValues extends BaseAttributeValue
     protected $value;
 
     /**
-     * @var string
-     * @ORM\Column(name="field_id", type="integer", nullable=false, unique=false)
-     */
-    protected $fieldId;
+     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\ExtraField")
+     * @ORM\JoinColumn(name="field_id", referencedColumnName="id")
+     **/
+    protected $field;
 
     /**
      * @var string
@@ -46,24 +47,64 @@ class ExtraFieldValues extends BaseAttributeValue
      * @var \DateTime $created
      *
      * @Gedmo\Timestampable(on="create")
-     * @ORM\Column(type="datetime")
+     * @ORM\Column(name="created_at", type="datetime")
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var \DateTime $updated
      *
      * @Gedmo\Timestampable(on="update")
-     * @ORM\Column(type="datetime")
+     * @ORM\Column(name="updated_at", type="datetime")
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * Constructor
      */
     public function __construct()
     {
-        $this->tms = new \DateTime();
+
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getField()
+    {
+        return $this->field;
+    }
+
+    /**
+     * @param mixed $field
+     *
+     * @return ExtraFieldValues
+     */
+    public function setField($field)
+    {
+        $this->field = $field;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getItemId()
+    {
+        return $this->itemId;
+    }
+
+    /**
+     * @param string $itemId
+     *
+     * @return ExtraFieldValues
+     */
+    public function setItemId($itemId)
+    {
+        $this->itemId = $itemId;
+
+        return $this;
     }
 
     /**
@@ -76,10 +117,14 @@ class ExtraFieldValues extends BaseAttributeValue
 
     /**
      * @param \DateTime $createdAt
+     *
+     * @return $this
      */
     public function setCreatedAt($createdAt)
     {
         $this->createdAt = $createdAt;
+
+        return $this;
     }
 
     /**
@@ -92,10 +137,14 @@ class ExtraFieldValues extends BaseAttributeValue
 
     /**
      * @param \DateTime $updatedAt
+     *
+     * @return $this
      */
     public function setUpdatedAt($updatedAt)
     {
         $this->updatedAt = $updatedAt;
+
+        return $this;
     }
 
      /**