diff --git a/lib/Doctrine/Entities/Basket.php b/lib/Doctrine/Entities/Basket.php
index 2c8027a73e..747e85b4d5 100644
--- a/lib/Doctrine/Entities/Basket.php
+++ b/lib/Doctrine/Entities/Basket.php
@@ -294,4 +294,29 @@ class Basket
     return $this->validation;
   }
 
+    /**
+     * @var boolean $is_read
+     */
+    private $is_read = false;
+
+
+    /**
+     * Set is_read
+     *
+     * @param boolean $isRead
+     */
+    public function setIsRead($isRead)
+    {
+        $this->is_read = $isRead;
+    }
+
+    /**
+     * Get is_read
+     *
+     * @return boolean 
+     */
+    public function getIsRead()
+    {
+        return $this->is_read;
+    }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/Entities/WorkZone.php b/lib/Doctrine/Entities/StoryWorkZone.php
similarity index 95%
rename from lib/Doctrine/Entities/WorkZone.php
rename to lib/Doctrine/Entities/StoryWorkZone.php
index 3a7afe537b..3692a24edd 100644
--- a/lib/Doctrine/Entities/WorkZone.php
+++ b/lib/Doctrine/Entities/StoryWorkZone.php
@@ -21,7 +21,7 @@ require_once __DIR__ . '/../../classes/cache/cacheableInterface.class.php';
 require_once __DIR__ . '/../../classes/User/Interface.class.php';
 require_once __DIR__ . '/../../classes/User/Adapter.class.php';
 
-class WorkZone
+class StoryWorkZone
 {
   
     /**
@@ -147,8 +147,14 @@ class WorkZone
     
     public function setRecord(\record_adapter $record)
     {
+      if(!$record->is_grouping())
+      {
+        throw new \Exception('Only storie allowed');
+      }
+      
       $this->setRecordId($record->get_record_id());
       $this->setSbasId($record->get_sbas_id());
+      
       return;
     }
     
diff --git a/lib/Doctrine/Entities/ValidationParticipant.php b/lib/Doctrine/Entities/ValidationParticipant.php
index f66b69768d..c9b9dc2a1c 100644
--- a/lib/Doctrine/Entities/ValidationParticipant.php
+++ b/lib/Doctrine/Entities/ValidationParticipant.php
@@ -112,4 +112,29 @@ class ValidationParticipant
     {
         return $this->session;
     }
+    /**
+     * @var boolean $is_aware
+     */
+    private $is_aware = false;
+
+
+    /**
+     * Set is_aware
+     *
+     * @param boolean $isAware
+     */
+    public function setIsAware($isAware)
+    {
+        $this->is_aware = $isAware;
+    }
+
+    /**
+     * Get is_aware
+     *
+     * @return boolean 
+     */
+    public function getIsAware()
+    {
+        return $this->is_aware;
+    }
 }
\ No newline at end of file
diff --git a/lib/conf.d/Doctrine/Entities.Basket.dcm.yml b/lib/conf.d/Doctrine/Entities.Basket.dcm.yml
index dd6d2e0539..6b865093bc 100644
--- a/lib/conf.d/Doctrine/Entities.Basket.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.Basket.dcm.yml
@@ -15,6 +15,8 @@ Entities\Basket:
       nullable: true
     usr_id:
       type: integer
+    is_read:
+      type: boolean
     pusher_id:
       type: integer
       nullable: true
diff --git a/lib/conf.d/Doctrine/Entities.WorkZone.dcm.yml b/lib/conf.d/Doctrine/Entities.StoryWorkZone.dcm.yml
similarity index 88%
rename from lib/conf.d/Doctrine/Entities.WorkZone.dcm.yml
rename to lib/conf.d/Doctrine/Entities.StoryWorkZone.dcm.yml
index e0e6dddc90..55be1cd937 100644
--- a/lib/conf.d/Doctrine/Entities.WorkZone.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.StoryWorkZone.dcm.yml
@@ -1,6 +1,6 @@
-Entities\WorkZone:
+Entities\StoryWorkZone:
   type: entity
-  table: WorkZone
+  table: StoryWorkZone
   uniqueConstraints:
     user_story:
       columns: usr_id,sbas_id,record_id
diff --git a/lib/conf.d/Doctrine/Entities.ValidationParticipant.dcm.yml b/lib/conf.d/Doctrine/Entities.ValidationParticipant.dcm.yml
index b0408273ef..53b32d530e 100644
--- a/lib/conf.d/Doctrine/Entities.ValidationParticipant.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.ValidationParticipant.dcm.yml
@@ -9,6 +9,8 @@ Entities\ValidationParticipant:
   fields:
     usr_id:
       type: integer
+    is_aware:
+      type: boolean
   oneToMany:
     datases:
       targetEntity: ValidationData