diff --git a/composer.json b/composer.json
index 8b4b565b..abee2773 100755
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
         "fortawesome/font-awesome": "v4.7.0",
         "opensilex/opencpu-client-php": "dev-master",
         "himiklab/yii2-handsontable-widget" : "v1.1.1",
-        "phayes/geophp": "1.2"
+        "phayes/geophp": "1.2",
+        "antkaz/yii2-vue": "^1.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "2.0.14",
diff --git a/composer.lock b/composer.lock
index 5b1dfd05..76d673e7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,51 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a81ff6872bbd8b0fdf3f387ebc99092a",
-    "content-hash": "05c766297ee7a05e6c5a1c1b8da57159",
+    "content-hash": "c1a3ce2e444177eef1da5e0ce5a3cb00",
     "packages": [
+        {
+            "name": "antkaz/yii2-vue",
+            "version": "v1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antkaz/yii2-vue.git",
+                "reference": "ba341bdbcfffa96662f49fe83152a867191d3b72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antkaz/yii2-vue/zipball/ba341bdbcfffa96662f49fe83152a867191d3b72",
+                "reference": "ba341bdbcfffa96662f49fe83152a867191d3b72",
+                "shasum": ""
+            },
+            "require": {
+                "npm-asset/vue": "~2.5.13",
+                "yiisoft/yii2": "~2.0.14"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "antkaz\\vue\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anton Kazarinov",
+                    "email": "askazarinov@gmail.com"
+                }
+            ],
+            "description": "The Vue.js extension for the Yii framework",
+            "homepage": "https://github.com/antkaz/yii2-vue",
+            "keywords": [
+                "Vue.js",
+                "vue",
+                "yii2"
+            ],
+            "time": "2018-03-01T19:37:33+00:00"
+        },
         {
             "name": "borales/yii2-phone-input",
             "version": "0.1.2",
@@ -2213,6 +2255,76 @@
             ],
             "time": "2019-01-21T22:06:44+00:00"
         },
+        {
+            "name": "npm-asset/vue",
+            "version": "2.5.22",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz",
+                "shasum": "3bf88041af08b8539c37b268b70ca79245e9cc30"
+            },
+            "type": "npm-asset-library",
+            "extra": {
+                "npm-asset-bugs": {
+                    "url": "https://github.com/vuejs/vue/issues"
+                },
+                "npm-asset-main": "dist/vue.runtime.common.js",
+                "npm-asset-directories": [],
+                "npm-asset-repository": {
+                    "type": "git",
+                    "url": "git+https://github.com/vuejs/vue.git"
+                },
+                "npm-asset-scripts": {
+                    "dev": "rollup -w -c scripts/config.js --environment TARGET:web-full-dev",
+                    "dev:cjs": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-cjs",
+                    "dev:esm": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-esm",
+                    "dev:test": "karma start test/unit/karma.dev.config.js",
+                    "dev:ssr": "rollup -w -c scripts/config.js --environment TARGET:web-server-renderer",
+                    "dev:compiler": "rollup -w -c scripts/config.js --environment TARGET:web-compiler ",
+                    "dev:weex": "rollup -w -c scripts/config.js --environment TARGET:weex-framework",
+                    "dev:weex:factory": "rollup -w -c scripts/config.js --environment TARGET:weex-factory",
+                    "dev:weex:compiler": "rollup -w -c scripts/config.js --environment TARGET:weex-compiler ",
+                    "build": "node scripts/build.js",
+                    "build:ssr": "npm run build -- web-runtime-cjs,web-server-renderer",
+                    "build:weex": "npm run build -- weex",
+                    "test": "npm run lint && flow check && npm run test:types && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr && npm run test:weex",
+                    "test:unit": "karma start test/unit/karma.unit.config.js",
+                    "test:cover": "karma start test/unit/karma.cover.config.js",
+                    "test:e2e": "npm run build -- web-full-prod,web-server-basic-renderer && node test/e2e/runner.js",
+                    "test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.js",
+                    "test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.js",
+                    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
+                    "test:types": "tsc -p ./types/test/tsconfig.json",
+                    "lint": "eslint src scripts test",
+                    "flow": "flow check",
+                    "sauce": "karma start test/unit/karma.sauce.config.js",
+                    "bench:ssr": "npm run build:ssr && node benchmarks/ssr/renderToString.js && node benchmarks/ssr/renderToStream.js",
+                    "release": "bash scripts/release.sh",
+                    "release:weex": "bash scripts/release-weex.sh",
+                    "release:note": "node scripts/gen-release-note.js",
+                    "commit": "git-cz"
+                },
+                "npm-asset-config": {
+                    "commitizen": {
+                        "path": "./node_modules/cz-conventional-changelog"
+                    }
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Evan You"
+                }
+            ],
+            "description": "Reactive, component-oriented view layer for modern web interfaces.",
+            "homepage": "https://github.com/vuejs/vue#readme",
+            "keywords": [
+                "vue"
+            ],
+            "time": "2019-01-11T23:18:40+00:00"
+        },
         {
             "name": "oomphinc/composer-installers-extender",
             "version": "v1.1.2",
diff --git a/config/params.php b/config/params.php
index 96ffe266..fdceacdf 100755
--- a/config/params.php
+++ b/config/params.php
@@ -38,6 +38,12 @@
     'webServicePageSizeMax' => 2097152,
 
     // ONTOLOGY -----------------------------------------------------------------
+    //-------- Provenance NameSpaces
+    'provenanceNamespaces' => [
+       "prov"=>"http://www.w3.org/ns/prov#",
+       "oeso"=>"http://www.opensilex.org/vocabulary/oeso#",
+       "rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       ],
     //-------- Concepts
     'Actuator' => 'http://www.opensilex.org/vocabulary/oeso#Actuator',
     'Lens' => 'http://www.opensilex.org/vocabulary/oeso#Lens',
diff --git a/controllers/DatasetController.php b/controllers/DatasetController.php
index 03c22cf0..be4c223a 100755
--- a/controllers/DatasetController.php
+++ b/controllers/DatasetController.php
@@ -19,14 +19,12 @@
 use yii\web\Controller;
 use yii\web\UploadedFile;
 use yii\filters\VerbFilter;
-use Exception;
-use app\models\yiiModels\YiiDocumentModel;
 use app\models\wsModels\WSProvenanceModel;
-use app\models\yiiModels\VariableSearch;
 use app\models\wsModels\WSDataModel;
-use app\models\yiiModels\YiiConcernedItemModel;
 use openSILEX\handsontablePHP\adapter\HandsontableSimple;
 use openSILEX\handsontablePHP\classes\ColumnConfig;
+use app\models\wsModels\WSConstants;
+use app\models\yiiModels\YiiExperimentModel;
 
 require_once '../config/config.php';
 
@@ -42,7 +40,7 @@ class DatasetController extends Controller {
     //create a global configuration file for the csv files
     //\SILEX:TODO
 
-    const AGRONOMICAL_OBJECT_URI = "ScientificObjectURI";
+    const AGRONOMICAL_OBJECT_URI = "ScientificObjectAlias";
     const DATE = "Date";
     const VALUE = "Value";
     const ERRORS_MISSING_COLUMN = "Missing Columns";
@@ -50,7 +48,7 @@ class DatasetController extends Controller {
     const ERRORS_LINE = "Line";
     const ERRORS_COLUMN = "Column";
     const ERRORS_MESSAGE = "Message";
-
+    
     /**
      * define the behaviors
      * @return array
@@ -125,17 +123,16 @@ public function actionGenerateAndDownloadDatasetCreationFile() {
         foreach ($variables as $variableAlias) {
             $fileColumns[] = $variableAlias;
         }
-
-        $csvPath = "coma";
-        if (Yii::$app->params['csvSeparator'] == ";") {
-            $csvPath = "semicolon";
-        }
         
-        $file = fopen('./documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv', 'w');
-        fputcsv($file, $fileColumns, $delimiter = Yii::$app->params['csvSeparator']);
-        fclose($file);
+        $csvString = implode(Yii::$app->params['csvSeparator'], $fileColumns); 
+        return json_encode($csvString);
     }
-
+    
+    
+    
+    
+   
+    
     /**
      * 
      * @param array $csvErrors the errors founded. 
@@ -309,19 +306,23 @@ private function addColumnErrorsAndMissingToArray($arrayData, $arrayErrors) {
      */
     public function actionCreate() {
         $datasetModel = new \app\models\yiiModels\YiiDatasetModel();
-        $variablesModel = new \app\models\yiiModels\YiiVariableModel();
-
-        $token = Yii::$app->session['access_token'];
-
-        // Load existing variables
-        $variables = $variablesModel->getInstancesDefinitionsUrisAndLabel($token);
-        $this->view->params["variables"] = $this->getVariablesListLabelToShowFromVariableList($variables);
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
 
         // Load existing provenances
         $provenanceService = new WSProvenanceModel();
         $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
         $this->view->params["provenances"] = $provenances;
 
+         // Load existing agents
+        $userModel = new \app\models\yiiModels\YiiUserModel();
+        $users = $userModel->getPersonsURIAndName($token);
+        $this->view->params['agents'] = $users;
+        
+        // Load experiments
+        $experimentModel = new YiiExperimentModel();
+        $experiments =  $experimentModel->getExperimentsURIAndLabelList($token);
+        $this->view->params['experiments'] = $experiments;
+        
         //If the form is complete, register data
         if ($datasetModel->load(Yii::$app->request->post())) {
             //Store uploaded CSV file
@@ -335,55 +336,60 @@ public function actionCreate() {
             unlink($serverFilePath);
 
             //Loaded given variables
-            $givenVariables = $datasetModel->variables;
-
+            $experimentController = new ExperimentController();
+            $experimentVariables = $experimentController->getExperimentMesuredVariablesSelectList($datasetModel->experiment) ;
+            $csvRawVariables = array_slice($csvHeaders, 2);
+            // clean variables name
+            $csvVariables = array_map('trim', $csvRawVariables);
+            // select all variables that don"t exist in experiment variables
+            $variablesNotInExperiment = array_diff($csvVariables, array_values($experimentVariables)); 
             // Check CSV header with variables
-            if (array_slice($csvHeaders, 2) === $givenVariables) {
-
-                // Get selected or create Provenance URI
-                if (!array_key_exists($datasetModel->provenanceUri, $provenances)) {
-                    $provenanceUri = $this->createProvenance(
-                            $datasetModel->provenanceUri,
-                            $datasetModel->provenanceComment
-                    );
-                    $datasetModel->provenanceUri = $provenanceUri;
-                    $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
-                    $this->view->params["provenances"] = $provenances;
-                } else {
+            if (count($variablesNotInExperiment) === 0) {
                     $provenanceUri = $datasetModel->provenanceUri;
-                }
-
-                // If provenance sucessfully created
-                if ($provenanceUri) {
-                    // Link uploaded documents to provenance URI
-                    $linkDocuments = true;
-                    if (is_array($datasetModel->documentsURIs) && is_array($datasetModel->documentsURIs["documentURI"])) {
-                        $linkDocuments = $this->linkDocumentsToProvenance(
-                                $provenanceUri,
-                                $datasetModel->documentsURIs["documentURI"]
-                        );
+                    $SciencitificObjectSearch = new \app\models\yiiModels\ScientificObjectSearch();
+                    $SciencitificObjectSearch->experiment = $datasetModel->experiment;
+                    $SciencitificObjectSearch->pageSize = 30000;
+                    $SciencitificObjectSearch->setWithProperties(false);
+                    $SciencitificObjectSearchResults = $SciencitificObjectSearch->search($token);
+
+                    $objectUris = [];
+                    foreach ($SciencitificObjectSearchResults->getModels() as $object){
+                        $objectUris[$object->uri]=$object->label;
                     }
-
                     $datasetModel->documentsURIs = null;
-
-                    if ($linkDocuments === true) {
+                        $objectsErrors = [];
                         // Save CSV data linked to provenance URI
                         $values = [];
                         foreach ($fileContent as $rowStr) {
                             $row = str_getcsv($rowStr, Yii::$app->params['csvSeparator']);
-                            $scientifObjectUri = $row[0];
+                            $scientifObjectAlias = $row[0];
+                            if(!array_search($scientifObjectAlias, $objectUris)){
+                                $objectsErrors[] = $scientifObjectAlias .  Yii::t("app/messages", " Object does not exists in this experiment");
+                                $scientifObjectUri = null;
+                            }else{
+                                $scientifObjectUri = array_search($scientifObjectAlias, $objectUris);
+                            }
                             $date = $row[1];
                             for ($i = 2; $i < count($row); $i++) {
                                 $values[] = [
                                     "provenanceUri" => $provenanceUri,
                                     "objectUri" => $scientifObjectUri,
-                                    "variableUri" => array_search($givenVariables[$i - 2], $variables),
+                                    "variableUri" => array_search($csvVariables[$i - 2], $experimentVariables),
                                     "date" => $date,
                                     "value" => $row[$i]
                                 ];
                             }
                         }
-
+                        
+                        if(!empty($objectsErrors)){
+                            return $this->render('create', [
+                                'model' => $datasetModel,
+                                'errors' => $objectsErrors
+                                    ]
+                            );
+                        }
+                       
+                        
                         $dataService = new WSDataModel();
                         $result = $dataService->post($token, "/", $values);
 
@@ -402,27 +408,12 @@ public function actionCreate() {
                                         'errors' => $result->metadata->status
                             ]);
                         }
-                    } else {
-                        return $this->render('create', [
-                                    'model' => $datasetModel,
-                                    'errors' => [
-                                        Yii::t("app/messages", "Error while creating linked documents")
-                                    ]
-                        ]);
-                    }
-                } else {
-                    return $this->render('create', [
-                                'model' => $datasetModel,
-                                'errors' => [
-                                    Yii::t("app/messages", "Error while creating provenance")
-                                ]
-                    ]);
-                }
+                
             } else {
                 return $this->render('create', [
                             'model' => $datasetModel,
                             'errors' => [
-                                Yii::t("app/messages", "CSV file headers does not match selected variables")
+                                Yii::t("app/messages", "CSV file headers does not match variables used in this experiment. The following Variables are not associated to this experiment " ) . "(" . implode(",", $variablesNotInExperiment) . ")"
                             ]
                 ]);
             }
@@ -432,65 +423,5 @@ public function actionCreate() {
             ]);
         }
     }
-
-    /**
-     * Create provenance from an alias and a comment
-     * @param type $alias
-     * @param type $comment
-     * @return boolean
-     */
-    private function createProvenance($alias, $comment) {
-        $provenanceService = new WSProvenanceModel();
-        $date = new \DateTime();
-        $provenanceUri = $provenanceService->createProvenance(
-                Yii::$app->session['access_token'],
-                $alias,
-                $comment,
-                [
-                    "creationDate" => $date->format("Y-m-d\TH:i:sO")
-                ]
-        );
-
-        if (is_string($provenanceUri) && $provenanceUri != "token") {
-            return $provenanceUri;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Link list of documents to the given provenance uri
-     * (unlinked -> linked)
-     * @param string $provenanceUri
-     * @param array $documents
-     * @return boolean
-     */
-    private function linkDocumentsToProvenance($provenanceUri, $documents) {
-        $documentModel = new YiiDocumentModel(null, null);
-
-        // associated documents update
-        foreach ($documents as $documentURI) {
-            $documentModel = new YiiDocumentModel(null, null);
-            $documentModel->findByURI(Yii::$app->session['access_token'], $documentURI);
-            $documentModel->status = "linked";
-            $concernedItem = new YiiConcernedItemModel();
-            $concernedItem->uri = $provenanceUri;
-            $concernedItem->rdfType = Yii::$app->params["Provenance"];
-            $documentModel->concernedItems = [$concernedItem];
-            $dataToSend[] = $documentModel->attributesToArray();
-        }
-
-        if (isset($dataToSend)) {
-            $requestRes = $documentModel->update(Yii::$app->session['access_token'], $dataToSend);
-
-            if (is_string($requestRes) && $requestRes === "token") {
-                return false;
-            } else {
-                return true;
-            }
-        } else {
-            return true;
-        }
-    }
-
+    
 }
diff --git a/controllers/ExperimentController.php b/controllers/ExperimentController.php
index 69944dca..629fb557 100755
--- a/controllers/ExperimentController.php
+++ b/controllers/ExperimentController.php
@@ -404,4 +404,42 @@ public function actionUpdateSensors() {
         
         return json_encode($res, JSON_UNESCAPED_SLASHES);
     }
+    
+    
+     /**
+     * Return an array of variable label mapped with variable uri
+     * @return array
+     */
+    public function actionAjaxGetExperimentMesuredVariablesSelectList($experimentUri){
+        
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $variables = [];
+        $variables["data"] = [];
+        $experimentVariable = $this->getExperimentMesuredVariablesSelectList($experimentUri);
+        foreach ($experimentVariable as $key => $value) {
+            $variables["data"][] = ["id" => $key, "text" => $value];
+        }
+       
+        return($variables);
+    }
+    
+    /**
+     * Prepare a variable list associated to an experiment
+     * @param string $experimentUri
+     * @return array
+     */
+    public function getExperimentMesuredVariablesSelectList($experimentUri) {
+        if(!isset($experimentUri) || empty($experimentUri)){
+            return [];
+        }
+        $experimentModel = new YiiExperimentModel();
+        $variables = $experimentModel->getMeasuredVariables(
+                Yii::$app->session[WSConstants::ACCESS_TOKEN],
+                $experimentUri
+                );
+        if(isset($variables) && is_array($variables)){
+            return $variables;
+        }
+        return [];
+    }
 }
diff --git a/controllers/ProvenanceController.php b/controllers/ProvenanceController.php
new file mode 100644
index 00000000..1baeec5b
--- /dev/null
+++ b/controllers/ProvenanceController.php
@@ -0,0 +1,213 @@
+<?php
+namespace app\controllers;
+
+require_once '../config/config.php';
+
+use Yii;
+use yii\filters\VerbFilter;
+use yii\web\Controller;
+use app\models\wsModels\WSProvenanceModel;
+use app\models\yiiModels\YiiDocumentModel;
+use app\models\wsModels\WSConstants;
+use app\models\yiiModels\YiiConcernedItemModel;
+
+/**
+ * CRUD actions for YiiDataModel
+ * 
+ * @see yii\web\Controller
+ * @see app\models\yiiModels\YiiDataModel
+ * @author Arnaud Charleroy <arnaud.charleroy@inra.fr>
+ */
+class ProvenanceController extends Controller {
+    
+    /**
+     * Define the behaviors
+     * 
+     * @return array
+     */
+    public function behaviors() {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+    
+    /**
+     * Create a provenance from post data with documents Uri associated
+     * [
+     *  provenance : { label, comment, metadata:{ ... } },
+     *  documents : { uri1,uri2}
+     * ]
+     */
+    public function actionAjaxCreateProvenanceFromDataset(){
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+        
+        $documents = [];
+        
+        $provenance = $data["provenance"];
+        if(isset($data["documents"])){
+            $documents = $data["documents"];
+        }
+        $provenanceUri = $this->createProvenance(
+                            $provenance['label'],
+                            $provenance['comment'],
+                            $provenance['sensingDevices'],
+                            $provenance['agents']
+                    );
+        
+        $this->linkDocumentsToProvenance($provenanceUri, $documents);
+        
+        if($provenanceUri != false){
+            return $provenanceUri;
+        }
+        return false;
+    }
+    
+    /**
+     * Update provenance documents from post data 
+     * [
+     *  provenance : { label, comment, metadata:{ ... } },
+     *  documents : { uri1,uri2}
+     * ]
+     */
+    public function actionAjaxUpdateProvenanceDocumentsFromDataset(){
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+        
+        $documents = [];
+        
+        $provenanceUri = $data["provenanceUri"];
+        if(isset($data["documents"])){
+            $documents = $data["documents"];
+        }
+        
+        return $this->linkDocumentsToProvenance($provenanceUri, $documents);
+    }
+    
+    /**
+     * Return an array with provenance list with all characteristics
+     * and provenance label mapped with provenance uri
+     * @return array
+     */
+    public function actionAjaxGetProvenancesSelectList(){
+        $token = Yii::$app->session[WSConstants::ACCESS_TOKEN];
+
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $provenanceService = new WSProvenanceModel();
+
+        $provenances = $this->mapProvenancesByUri($provenanceService->getAllProvenances($token));
+        
+        foreach ($provenances as $uri => $provenance) {
+            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+        }
+        $result['provenances'] = $provenances;
+        $result['provenancesByUri'] = $provenancesArray;
+        return $result;
+    }
+    
+    
+    /**
+     * Create provenance from an alias and a comment
+     * @param string $alias label of the provenance
+     * @param string $comment comment linked to the provenance
+     * @param array $sensingDevices uri of the sensor
+     * @param array $agents uri of the agent
+     * @return boolean
+     */
+    private function createProvenance($alias, $comment,$sensingDevices = [], $agents = []) {
+        $provenanceService = new WSProvenanceModel();
+        $date = new \DateTime();
+        $createdDate = $date->format("Y-m-d\TH:i:sO");
+        $metadata = [];
+        foreach ($sensingDevices as $sensingDevice) {
+            if(!isset($metadata["prov:Agent"])){
+                $metadata["prov:Agent"] = [];
+            }
+          $metadata["prov:Agent"][] = [
+              "prov:id" =>  $sensingDevice,
+              "rdf:type" => "oeso:SensingDevice"
+            ];
+        }
+        foreach ($agents as $agent) {
+            if(!isset($metadata["prov:Agent"])){
+                $metadata["prov:Agent"] = [];
+            }
+            $metadata["prov:Agent"][] = [
+                "prov:id" => $agent,
+                "rdf:type" => "oeso:Operator"
+            ];
+        }
+            
+        $provenanceUri = $provenanceService->createProvenance(
+                Yii::$app->session['access_token'],
+                $alias,
+                $comment,
+                $createdDate,
+                $metadata
+        );
+
+        if (is_string($provenanceUri) && $provenanceUri != "token") {
+            return $provenanceUri;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Create an associative array of the provenances objects indexed by their URI
+     * @param type $provenances
+     * @return array
+     */
+    private function mapProvenancesByUri($provenances) {
+        $provenancesMap = [];
+        if ($provenances !== null) {
+            foreach ($provenances as $provenance) {
+                $provenancesMap[$provenance->uri] = $provenance;
+            }
+        }
+
+        return $provenancesMap;
+    }
+    
+     /**
+     * Link list of documents to the given provenance uri
+     * (unlinked -> linked)
+     * @param string $provenanceUri
+     * @param array $documents
+     * @return boolean
+     */
+    private function linkDocumentsToProvenance($provenanceUri, $documents) {
+        $documentModel = new YiiDocumentModel(null, null);
+
+        // associated documents update
+        foreach ($documents as $documentURI) {
+            $documentModel = new YiiDocumentModel(null, null);
+            $documentModel->findByURI(Yii::$app->session['access_token'], $documentURI);
+            $documentModel->status = "linked";
+            $concernedItem = new YiiConcernedItemModel();
+            $concernedItem->uri = $provenanceUri;
+            $concernedItem->rdfType = Yii::$app->params["Provenance"];
+            $documentModel->concernedItems = [$concernedItem];
+            $dataToSend[] = $documentModel->attributesToArray();
+        }
+
+        if (isset($dataToSend)) {
+            $requestRes = $documentModel->update(Yii::$app->session['access_token'], $dataToSend);
+
+            if (is_string($requestRes) && $requestRes === "token") {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/models/wsModels/WSDataModel.php b/models/wsModels/WSDataModel.php
index 8cdbc79b..00ffada8 100644
--- a/models/wsModels/WSDataModel.php
+++ b/models/wsModels/WSDataModel.php
@@ -19,6 +19,12 @@
  */
 class WSDataModel extends\openSILEX\guzzleClientPHP\WSModel {
     
+     /**
+     * Date format for the webservice filters with timezone
+     * @example: 2017-05-03T12:35:00+2000
+     */
+    const DATE_FORMAT = "Y-m-d\TH:i:sO";
+    
     /**
      * initialize access to the projects service. Calls super constructor
      */
diff --git a/models/wsModels/WSProvenanceModel.php b/models/wsModels/WSProvenanceModel.php
index e1e7c13c..a64b5aa9 100644
--- a/models/wsModels/WSProvenanceModel.php
+++ b/models/wsModels/WSProvenanceModel.php
@@ -34,19 +34,24 @@ public function __construct() {
      * @param type $sessionToken
      * @param type $label
      * @param type $comment
+     * @param type $createdDate Description
      * @param type $metadata
      * @return type
      */
-    public function createProvenance($sessionToken, $label, $comment, $metadata) {
+    public function createProvenance($sessionToken, $label, $comment,$createdDate, $metadata) {
         $subService = "/";
+        if(empty($metadata)){
+            $metadata = (object) array();
+        }
         $provenance = $this->post($sessionToken, $subService, [[
         "label" => $label,
         "comment" => $comment,
+        "created" => $createdDate,
         "metadata" => $metadata,
         ]]);
 
         if (
-                isset($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) && count($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) == 1
+            isset($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) && count($provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}) == 1
         ) {
             return $provenance->{WSConstants::METADATA}->{WSConstants::DATA_FILES}[0];
         } else {
@@ -54,6 +59,46 @@ public function createProvenance($sessionToken, $label, $comment, $metadata) {
         }
     }
 
+    /**
+     * Return an array of existing provenances match with criteria
+     * 
+     * @param string $sessionToken
+     * @param array $userCriteria array of citeria
+     * @return type
+     */
+    public function getSpecificProvenancesByCriteria($sessionToken,$userCriteria = []) {
+        $pageSize = 200;
+        $subService = "/";
+        $params = array_merge($userCriteria,[
+            WSConstants::PAGE => 0,
+            WSConstants::PAGE_SIZE => $pageSize
+        ]);
+       
+        $provenanceResult = $this->get($sessionToken, $subService, $params);
+        
+        if (isset($provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}) && isset($provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_COUNT}) && $provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_COUNT} > 0) {
+
+            $result = $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA};
+
+            $totalPages = $provenanceResult->{WSConstants::METADATA}->{WSConstants::PAGINATION}->{WSConstants::TOTAL_PAGES};
+
+            for ($currentPage = 1; $currentPage < $totalPages; $currentPage++) {
+                $params[WSConstants::PAGE] = $currentPage;
+                $params[WSConstants::PAGE_SIZE] = $pageSize;
+                
+                $provenanceResult = $this->get($sessionToken, $subService, $params);
+                
+                $result = array_merge($result, $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA});
+            }
+            
+            return $result;
+        }elseif(isset($provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA})){
+            return  $provenanceResult->{WSConstants::RESULT}->{WSConstants::DATA};
+        }else{
+            return [];
+        }
+    }
+    
     /**
      * Return an array of all existing provenances
      * 
diff --git a/models/yiiModels/ScientificObjectSearch.php b/models/yiiModels/ScientificObjectSearch.php
index 478694c4..2aa620c6 100755
--- a/models/yiiModels/ScientificObjectSearch.php
+++ b/models/yiiModels/ScientificObjectSearch.php
@@ -27,6 +27,8 @@ class ScientificObjectSearch extends YiiScientificObjectModel {
     //create a trait (?) with methods search and jsonListOfArray and use it in 
     //each class ElementNameSearch
     //\SILEX:refactor
+    private $withProperties;
+    const WITH_PROPERTIES = "withProperties";
     
     /**
      * @inheritdoc
@@ -34,7 +36,7 @@ class ScientificObjectSearch extends YiiScientificObjectModel {
     public function rules()
     {
         return [
-            [['uri', 'label', 'experiment', 'alias', 'type'], 'safe'],
+            [['uri', 'label', 'experiment', 'alias', 'type', 'withProperties'], 'safe'],
         ];
     }
     
@@ -82,4 +84,27 @@ public function search($sessionToken, $params) {
             ]);
         }
     }
+    
+    function getWithProperties() {
+        return $this->withProperties;
+    }
+
+    function setWithProperties($withProperties) {
+        if(is_bool($withProperties)){
+            $this->withProperties = $withProperties;
+        }else{
+            $this->withProperties = true;
+        }
+    }
+    
+    /**
+     * Add with properties parameters
+     * @return array
+     */
+    public function attributesToArray() {
+        $elementForWebService = parent::attributesToArray();
+        $elementForWebService[ScientificObjectSearch::WITH_PROPERTIES] = $this->getWithProperties(); 
+        
+        return $elementForWebService;
+    }
 }
\ No newline at end of file
diff --git a/models/yiiModels/YiiDatasetModel.php b/models/yiiModels/YiiDatasetModel.php
index 2cb084af..ab754348 100755
--- a/models/yiiModels/YiiDatasetModel.php
+++ b/models/yiiModels/YiiDatasetModel.php
@@ -25,8 +25,8 @@
 class YiiDatasetModel extends WSActiveRecord {
 
     /**
-     * Uri de la provenance
-     * @var type 
+     * Provenance uri
+     * @var string 
      */
     public $provenanceUri;
     
@@ -73,6 +73,24 @@ class YiiDatasetModel extends WSActiveRecord {
      * @var file
      */
     public $file;
+    
+    /**
+     * Sensor uris
+     * @var array 
+     */
+    public $provenanceSensingDevices;
+    
+    /**
+     * Agent uris
+     * @var array 
+     */
+    public $provenanceAgents;
+    
+    /**
+     * Experiment uri
+     * @var string 
+     */
+    public $experiment;
 
     const PROVENANCE = "provenance";
     const DATA = "data";
@@ -94,8 +112,10 @@ public function __construct($pageSize = null, $page = null) {
      */
     public function rules() {
         return [
-            [['variables', 'provenanceAlias', 'file', 'provenanceUri'], 'required'],
+            [['provenanceAlias', 'file', 'provenanceUri','experiment'], 'required'],
+            [['variables','provenanceSensingDevices','provenanceAgents'], 'safe'],
             [['provenanceComment'], 'string'],
+            [['experiment'], 'string'],
             [['provenanceUri', 'provenanceComment', 'documentsURIs', 'data', 'file'], 'safe'],
             [['file'], 'file', 'extensions' => 'csv']
         ];
@@ -107,11 +127,14 @@ public function rules() {
      */
     public function attributeLabels() {
         return [
-            'provenanceUri' => Yii::t('app', 'Provenance (URI)'),
+            'provenanceUri' => Yii::t('app', 'Provenance label'),
             'provenanceComment' => Yii::t('app', 'Provenance comment'),
-            'variables' => Yii::t('app', 'Variable(s)'),
+            'provenanceSensingDevices' => Yii::t('app', 'Provenance sensor(s)'),
+            'provenanceAgents' => Yii::t('app', 'Provenance operator(s)'),
+            'variables' => Yii::t('app', 'Experiment associated variable(s)'),
             'file' => Yii::t('app', 'Data file'),
-            'documentsUris' => Yii::t('app', 'Documents')
+            'documentsUris' => Yii::t('app', 'Documents'),
+            'experiment' => Yii::t('app', 'Experiment')
         ];
     }
 
diff --git a/translations/fr/app.php b/translations/fr/app.php
index 495e201a..aa8cecec 100755
--- a/translations/fr/app.php
+++ b/translations/fr/app.php
@@ -49,6 +49,7 @@
     'Add Dataset' => 'Importer un jeu de données',
     'Add Document' => 'Ajouter un document',
     'Add Document Script' => 'Ajouter un script',
+    'Add on scientific object' => 'Importer pour un objet scientifique',
     'Add row' => 'Ajouter une ligne',
     'Add Sensors' => 'Ajouter des Capteurs',
     'Add Vectors' => 'Ajouter des Vecteurs',
@@ -66,6 +67,7 @@
     'Availability' => 'Disponibilité',
 
     // B
+    'Back' => 'Retour',
     'Back to sensor view' => 'Retour à la vue du capteur',
     'Brand' => 'Marque',
     'BRDF coefficient P1' => 'Coefficient BRDF P1',
@@ -80,6 +82,7 @@
     'Characterize Sensor' => 'Caractériser un Capteur',
     'Characterize' => 'Caractériser',
     'Circular' => 'Circulaire',
+    'Choose experiment' => 'Choisir une expérimentation' ,
     'Contact' => 'Contact',
     'Contact / Help' => 'Contact / Aide',
     'Column' => 'Colonne',
@@ -96,6 +99,7 @@
     'Comment' => 'Commentaire',
     'Creation Date' => 'Date de Création',
     'Creator' => 'Auteur',
+    'Create provenance' => 'Créer la provenance',
     'Creator of the annotation' => 'Auteur de l\'annotation',
     'Crop Species' => 'Espèce',
 
@@ -105,12 +109,14 @@
     'Data Search'=>'Recherche de données',
     'Dataset' => 'Jeux de données',
     'Dataset Creation Date' => 'Données Insérées',
+    'Dataset input file' => 'Fichier de jeu de données',
     'Date' => 'Date',
     'Date End' => 'Date de fin',
     'Date Of Last Calibration' => 'Date de Dernier Étalonnage',
     'Date Of Purchase' => 'Date d\'Achat',
     'Date Start' => 'Date de début',
     'Description' => 'Description',
+    'Describe the produced dataset' => 'Décrire le jeu de données',
     'Diameter' => 'Diamètre',
     'Diameter (m)' => 'Diamètre (m)',
     'Document Type' => 'Type du Document',
@@ -130,6 +136,7 @@
     'Experimental Organization' => 'Organisation expérimentale',
     'Experiment'=>'Expérimentation',
     'Experiment Modalities' => 'Modalités Expérimentales',
+    'Experiment associated variable(s)' => 'Variable(s) associées à l\'expérimentation',
     EventAction::EVENT_UNUPDATABLE_DUE_TO_UNUPDATABLE_PROPRTY_LABEL =>
         "L'événement ne peut être mis à jour que via le web service car une de "
         . "ses propriétés spécifiques n'est actuellement pas compatible avec la webapp.",
@@ -159,6 +166,8 @@
     'Generate Layer' => 'Générer la Couche',
     'Generate Map' => 'Générer la Carte',
     'Generated URI' => 'URI générée',
+    'Generate dataset template' => 'Générer le gabarit du jeux de données',
+    'Generate dataset template (Optional)' => 'Generer le gabarit du jeu de données (Optionnel)',
     'Geographic Location' => 'Localisation géographique',
     'Geometry' => 'Géométrie',
     'Graphic visualization' => 'Visualisation graphique',
@@ -210,6 +219,8 @@
 
     // N
     'Name' => 'Nom',
+    'Need a dataset template ? (Optional)'=> 'Besoin d\'un gabarit jeu de données ? (Optionnel)',
+    'Next' => 'Suivant',
     'No' => 'Non',
     'No item concerned' => 'Aucun élément concerné',
     'No Specific Property' => 'Aucune Propriété Spécifique',
@@ -236,7 +247,10 @@
     'Properties'=>'Propriétés',
     PropertyWidget::NO_PROPERTY_LABEL => 'Aucune propriété spécifique',
     'Provenance comment' => 'Commentaire de la provenance',
-    'Provenance (URI)' => 'Provenance (URI)',
+    'Provenance (URI)' => 'Identifiant de la provenance',
+    'Provenance label' => 'Label de la provenance',
+    'Provenance operator(s)' => 'Opérateur(s) lié(s) à la provenance',
+    'Provenance sensor(s)' => 'Capteur(s) lié(s) à la provenance',
     'Public Access' => 'Accès Public',
 
     // Q
@@ -302,7 +316,8 @@
     'Update event' => 'Modifier l\'événement',
     'Update sensors' => 'Mise à jour des capteurs',
     'Update measured variables' => 'Mise à jour des variables mesurées',
-
+    'Upload dataset' => 'Soumettre le jeu de données',
+        
     // V
     'Value' => 'Valeur',
     'Value Labels' => 'Labels de la Valeur',
@@ -312,6 +327,7 @@
     'Variety' => 'Variété',
     'Verification Code' => 'Code de vérification',
     'View / Download' => 'Visualiser / Télécharger',
+    'View' => 'Visualiser',
 
     // W
     'Was Generated By' => 'Généré Par',
diff --git a/translations/fr/messages.php b/translations/fr/messages.php
index c44a0538..1599f842 100755
--- a/translations/fr/messages.php
+++ b/translations/fr/messages.php
@@ -98,7 +98,7 @@
     'Select image view...' => 'Sélectionnez la vue de l\'image...',
     'Select provenance...'=>'Sélectionnez la provenance...',
     'Select type...' => 'Sélectionnez le type...',
-    'Select one or many variables' => 'Sélectionnez une ou plusieurs variables',
+    'Select one or more variables' => 'Sélectionnez une ou plusieurs variables',
     'Select existing provenance or create a new one' => 'Selectionnez une provenance existante où créez en une nouvelle',
     'Software is licensed under AGPL-3.0 and data under CC BY-NC-SA 4.0' => 'Le logiciel est sous licence AGPL-3.0 et les données sous CC BY-NC-SA 4.0',
     'Some required fields are missings' => 'Des champs requis sont manquants.',
@@ -119,6 +119,7 @@
     'The variety used in the plot (e.g. apache)' => 'La variété du plot (ex. apache)',
     'To assign scientific objects to two experiments: (1) create the scientific objects on one of the experiments and (2) update them with the uri of the second experiment.' => 'Pour affecter des objets scientifiques à deux expériences: (1) créez les objets scientifiques sur l\'une des expériences et (2) mettez-les à jour avec l\'uri de la deuxième expérience.',
     'to get more information about the columns content' => 'pour obtenir davantage d\'information sur le contenu de chaque colonne',
+    'The variables associated to the choosen experiment' => 'Les variables associées à l\'expérimentation choisie',
 
     // U
     'Unknown error' => 'Erreur inconnue',
diff --git a/views/dataset/_form.php b/views/dataset/_form.php
old mode 100755
new mode 100644
index b9215a2a..f1cd99c1
--- a/views/dataset/_form.php
+++ b/views/dataset/_form.php
@@ -25,13 +25,306 @@
 /* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
 /* @var $handsontableErrorsCellsSettings string */
 
- if ($handsontable !== null) {
-     echo $handsontable->loadJSLibraries(true);
-     echo $handsontable->loadCSSLibraries();
- }
-
+if ($handsontable !== null) {
+    echo $handsontable->loadJSLibraries(true);
+    echo $handsontable->loadCSSLibraries();
+}
+use antkaz\vue\VueAsset;
+VueAsset::register($this);
+$this->registerJsFile("https://rawgit.com/cristijora/vue-form-wizard/master/dist/vue-form-wizard.js");
+$this->registerCssFile("https://rawgit.com/cristijora/vue-form-wizard/master/dist/vue-form-wizard.min.css");
+$this->registerCssFile("https://rawgit.com/lykmapipo/themify-icons/master/css/themify-icons.css");
 ?>
+ <script>
+            
+        /**
+         * Fill variable dropdown
+         * @param string experimentUri
+         * @returns void        */
+        function populateVariableList(experimentUri){
+            var select = $('#uriVariable-selector');
+            var settings = select.attr('data-krajee-select2'),
+            settings = window[settings];
+            if(experimentUri !== undefined && experimentUri !== null ){
+                $.ajax({
+                    url: '<?= Url::toRoute(['experiment/ajax-get-experiment-mesured-variables-select-list']); ?>',
+                    type: 'GET',
+                    dataType: 'json',
+                    data: {"experimentUri": experimentUri}
+                })
+                .done(function (data) {
+                    select.html("");
+                    console.log(data)
+                    if(data.data.length === 0){
+                        settings.data = {};
+                        select.val('').change();
+                    }else{
+                        settings.data = data.data;
+                        select.select2(settings).change();
+                    }
+                    
+                    
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    console.log(jqXHR)
+                });
+            }else{
+                select.val('').change();
+                select.html("");
+            }
+        }
+        
+        /**
+         * Save provenance model via ajax or update provenance documents
+         * @returns {Boolean}         */
+        function saveOrUpdateProvenance(){
+
+            var newProvenanceUri = $("#provenance-selector :selected").val();
+            
+            if(provenances.hasOwnProperty(newProvenanceUri)){
+                var documents = [];
+                var documentsInputList = $("input[id^='yiidatasetmodel-documentsuris-documenturi-']")
+                documentsInputList.each(function (i, documentInput) {
+                    documents.push($(documentInput).val());
+                });
+                if(documents.length > 0){
+                    $.ajax({
+                        url: '<?= Url::toRoute(['provenance/ajax-update-provenance-documents-from-dataset']); ?>',
+                        type: 'POST',
+                        datatype: 'json',
+                        data: {provenanceUri :newProvenanceUri,
+                                documents : documents}
+                    })
+                    .done(function () {
+                        toastr.info("Documents updated");
+                    }).fail(function (jqXHR, textStatus) {
+                        // Disaply errors
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                        toastr.error("An error has occured during provenance saving");
+                    });
+                }else{
+                    toastr.warning("No documents added");
+                }
+            }
+            
+            if(!provenances.hasOwnProperty(newProvenanceUri) 
+                    && $("#provenance-selector :selected").val() !== undefined
+                    && $("#provenance-selector :selected").val() !== ""){
+                var provenance = {};
+                toastr.info("Saving provenance ...");
+                provenance['label']= $("#provenance-selector :selected").val();
+                provenance['comment']= $("#yiidatasetmodel-provenancecomment").val();
+                provenance['documents']= [];
+                if($("#yiidatasetmodel-documentsuris").val() !== undefined){
+                    provenance['documents']= $("#yiidatasetmodel-documentsuris").val();
+                }
+                provenance['sensingDevices']= [];
+                if($("#yiidatasetmodel-sensingDevices").val() !== undefined){
+                    provenance['sensingDevices']= $("#yiidatasetmodel-sensingDevices").val();
+                }
+                provenance['agents']= [];
+                if($("#yiidatasetmodel-provenanceagents").val() !== undefined){
+                    provenance['agents']= $("#yiidatasetmodel-provenanceagents").val();
+                }
+                var documents = [];
+                var documentsInputList = $("input[id^='yiidatasetmodel-documentsuris-documenturi-']")
+                documentsInputList.each(function (i, documentInput) {
+                    documents.push($(documentInput).val());
+                });
+                
+                 $.ajax({
+                    url: '<?= Url::toRoute(['provenance/ajax-create-provenance-from-dataset']); ?>',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: {provenance :provenance,
+                            documents : documents}
+                })
+                .done(function (newProvenanceUri) {
+                    if(newProvenanceUri !== false){
+                        loadProvenances(newProvenanceUri)
+                        .done(function (data) {
+                            var select = $('#provenance-selector');
+                            var settings = select.attr('data-krajee-select2'),
+                            settings = window[settings];
+                            provenances = data.provenances;
+                            settings.data = data.provenancesByUri;
+                            select.select2(settings);
+                            updateProvenanceFields(newProvenanceUri);
+                            if(newProvenanceUri !== undefined && newProvenanceUri !== null){
+                                var $newOption = $("<option selected='selected'></option>").val(newProvenanceUri).text(data.provenancesByUri[newProvenanceUri])
+                                select.append($newOption).trigger('change');
+                            }
+                            toastr.success("Provenance saved");
+                        }).fail(function (jqXHR, textStatus) {
+                                // Disaply errors
+                                $('#document-save-msg').parent().removeClass('alert-info');
+                                $('#document-save-msg').parent().addClass('alert-danger');
+                                $('#document-save-msg').html('Request failed: ' + textStatus);
+                                toastr.error("An error has occured during provenance saving");
+                        });
+                    }else{
+                        $('#document-save-msg').parent().removeClass('alert-info');
+                        $('#document-save-msg').parent().addClass('alert-danger');
+                        $('#document-save-msg').html('Request failed: ' + textStatus);
+                        toastr.error("An error has occured during provenance saving"); 
+                    }
+                   
+                })
+                .fail(function (jqXHR, textStatus) {
+                    // Disaply errors
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                    toastr.error("An error has occured during provenance saving");
+                });
+
+            return false;   
+            }
+        }
+        
+        
+        function loadProvenances(provenanceSelectedUri){
+            return $.ajax({
+                    url: '<?= Url::toRoute(['provenance/ajax-get-provenances-select-list']); ?>',
+                    type: 'POST',
+                    datatype: 'json'
+            });
+        }
+        
+        /**
+        * Function to update provenance comment field depending of selected URI
+         * @param string  provenance uri
+         * @returns {undefined}         */
+        function updateProvenanceFields(uri) {
+            if (provenances.hasOwnProperty(uri)) {
+                // If selected provenance is known get its comment
+                var comment = provenances[uri]["comment"];
+
+                // Set provenance comment, disable input and remove validation messages 
+                $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
+                $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
+                        .removeClass("has-error")
+                        .removeClass("has-success");
+                $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
+
+                // Set provenance provenanceAgents, disable input and remove validation messages 
+                try {
+                    var provenanceAgents = [];
+                    provenances[uri]["metadata"]["prov:Agent"].forEach(function(agentElement){
+                        if(agentElement.hasOwnProperty("rdf:type") && agentElement["rdf:type"] === "oeso:Operator"){
+                            provenanceAgents.push(agentElement["prov:id"]);
+                        }
+                      });
+                    $("#yiidatasetmodel-provenanceagents").val(provenanceAgents);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                } catch (error) {
+                    $("#yiidatasetmodel-provenanceagents").val([]);
+                    $("#yiidatasetmodel-provenanceagents").trigger("change");
+                    console.log("No agents set");
+                } finally {
+                    $("#yiidatasetmodel-provenanceagents").val(agents).attr("disabled", "disabled");
+                    $(".field-yiidatasetmodel-provenanceagents, .field-yiidatasetmodel-provenanceagents *")
+                            .removeClass("has-error")
+                            .removeClass("has-success");
+                    $(".field-yiidatasetmodel-provenanceagents .help-block").empty();
+                }
+                // Load linked documents
+                $("#already-linked-documents").load(documentsLoadUri, {
+                    "uri": uri
+                });
+                $("#saveProvenanceButton").text("Add provenance documents");
+                $("#saveProvenanceButton").data("status","update");
+            } else {
+                // Otherwise clear provenance agents and enable input
+                $("#yiidatasetmodel-provenanceagents").val(agents).removeAttr("disabled").trigger("change");
+
+                // Otherwise clear provenance comment and enable input
+                $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+
+                // Clear linked documents list
+                $("#already-linked-documents").empty();
+                
+                $("#saveProvenanceButton").text("Create provenance");
+                $("#saveProvenanceButton").data("status","create");
+
+            }
+        }
+        
+        /**
+         *
+         * @returns void         */
+        function refreshRules(){
+             $(".dataset-variables").remove();
+                if($("#uriVariable-selector :selected").length > 0){
+                    $("#uriVariable-selector :selected").each(function (i, sel) {
+                        $('#dataset-csv-columns-desc').append(
+                                '<tr class="dataset-variables">'
+                                + '<th style="color:red" >'
+                                + $(sel).text() + ' *'
+                                + '</th>'
+                                + '<td>'
+                                + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
+                                + '</td>'
+                                + '</tr>');
+                    }); 
+                }else{
+                    $('#dataset-csv-columns-desc').append(
+                                '<tr class="dataset-variables">'
+                              + '<th style="color:red">Variable value *</th>'
+                              + '<td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)'
+                              + '</td>'
+                              + '</tr>');
+                }
+        }
+        
+        // The download function takes a CSV string, the filename and mimeType as parameters
+        // Scroll/look down at the bottom of this snippet to see how download is called
+        function download(content, fileName, mimeType) {
+          var a = document.createElement('a');
+          mimeType = mimeType || 'application/octet-stream';
+
+          if (navigator.msSaveBlob) { // IE10
+            navigator.msSaveBlob(new Blob([content], {
+              type: mimeType
+            }), fileName);
+          } else if (URL && 'download' in a) { //html5 A[download]
+            a.href = URL.createObjectURL(new Blob([content], {
+              type: mimeType
+            }));
+            a.setAttribute('download', fileName);
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+          } else {
+            location.href = 'data:application/octet-stream,' + encodeURIComponent(content); // only this mime type is supported
+          }
+        }
+        
+    </script>
+        <script>
+    $(document).ready(function () {
+        <?php
+        // Create Provenance select value<div class="collapse" id="collapseExample">s array
+        foreach ($this->params['provenances'] as $uri => $provenance) {
+            $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
+        }
+        // Inject URI to get document widget linked to an URI
+        echo 'documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
+         // Inject provenances list indexed by URI
+        echo 'experiments = ' . json_encode($this->params['experiments']) . ';';
+        // Inject provenances list indexed by URI
+        echo 'provenances = ' . json_encode($this->params['provenances']) . ';';
+        // Inject sensingDevices list indexed by URI
+        echo 'sensingDevices = ' . json_encode($this->params['sensingDevices']) . ';';
+        // Inject agents list indexed by URI
+        echo 'agents = ' . json_encode($this->params['agents']) . ';';
+        ?>
 
+    });
+    </script>
 <div class="dataset-form well">
     <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
 
@@ -44,6 +337,8 @@
         <h3 style="margin:3%;">Errors found in dataset :</h3>
         <ul>
         <?php 
+            $messageLimit = 10;
+            $messageCount = 0;
             // Display error messages
             $errorMessages = [];
             foreach($errors as $error) {
@@ -56,9 +351,14 @@
             
             $errorMessages = array_unique($errorMessages);
             foreach ($errorMessages as $errorMessage) {
-                 echo '<li>' . $errorMessage . '</li>';
+                if($messageCount <= $messageLimit){
+                    echo '<li>' . $errorMessage . '</li>';
+                }elseif($messageCount > $messageLimit){
+                    echo '<li>... other errors are masked</li>';
+                    break;
+                }
+                $messageCount++;
             }
-            
         ?>
         </ul>
     </div>
@@ -66,200 +366,311 @@
         endif;
     ?>
     <?php
-        if (isset($handsontable) && $handsontable !== null):
-    ?>
+    if (isset($handsontable) && $handsontable !== null):
+        ?>
         <div id="errors">
 
             <h3 class="alert alert-danger" style="margin:3%;">Errors found in dataset </h3>
 
-                <div id="<?= $handsontable->getContainerName() ?>">
-                </div>
-                <script>
-                    <?= $handsontable->generateJavascriptCode(); ?>
-                    <?= $handsontableErrorsCellsSettings; ?>
-                </script>
+            <div id="<?= $handsontable->getContainerName() ?>">
+            </div>
+            <script>
+    <?= $handsontable->generateJavascriptCode(); ?>
+    <?= $handsontableErrorsCellsSettings; ?>
+            </script>
 
         </div>
 
         <h3 class="alert alert-info" style="margin:3%;">Add dataset form</h3>
-    <?php endif; ?>
-    
-    <?= $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $this->params['variables'],
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select one or many variables') . ' ...',
-                    'id' => 'uriVariable-selector',
-                    'multiple' => true
-                ],
+<?php endif; ?>
+        <div id="app">
+            <div>
+                <template>
+                <form-wizard @on-complete="onComplete"
+                             @on-validate="handleValidation"
+                             @on-loading="setLoading"
+                              shape="square"
+                              color="#3498db"
+                              back-button-text="<?= Yii::t('app','Back') ?>"
+                              next-button-text="<?= Yii::t('app','Next') ?>"
+                              finish-button-text="<?= Yii::t('app', 'Upload dataset') ?>"
+                              >
+                    <div class="loader" v-if="loadingWizard"></div>
+                    <tab-content title="<?= Yii::t('app','Choose experiment') ?>"
+                                 icon="ti-user" 
+                                 :before-change="beforeSelectProvenance">
+    <?=
+    $form->field($model, 'experiment')->widget(\kartik\select2\Select2::classname(), [
+        'data' => $this->params['experiments'],
+        'options' => [
+            'placeholder' => Yii::t('app/messages', 'Select one experiment') . ' ...',
+            'id' => 'experiment-selector',
+            'multiple' => false
+        ],
+        'pluginOptions' => [
+            'allowClear' => true,
+            'tags' => true
+        ],  
+        'pluginEvents' => [
+            'select2:select' => 'function(e) { populateVariableList(e.params.data.id); }',
+        ]
+    ]);
+    ?>
+            </tab-content>
+            <tab-content title="<?= Yii::t('app','Generate dataset template (Optional)') ?>"
+                                         icon="ti-user" 
+                                         :before-change="beforeSelectProvenance">
+            <hr style="border-color:gray;"/>
+            <h3><i>  <?= Yii::t('app', 'Need a dataset template ? (Optional)') ?></i></h3>
+            <p class="alert alert-info"><?= Yii::t('app/messages', 'The variables associated to the choosen experiment'); ?></p>
+        <?php
+            $select2VariablesOptions =  [
+                'placeholder' => Yii::t('app/messages', 'Select one or more variables') . ' ...',
+                'id' => 'uriVariable-selector',
+                'multiple' => true
+            ]; 
+        ?>
+
+        <?=
+            $form->field($model, 'variables')->widget(\kartik\select2\Select2::classname(), [
+                'data' => [],
+                'options' => $select2VariablesOptions,
                 'pluginOptions' => [
                     'allowClear' => true,
-                    'tags' => true
+                    'tags' => false
                 ],
-            ]); ?>
-
-    <hr style="border-color : gray;"/>
-    <h3><?= Yii::t('app', 'Provenance')?></h3>
-
-    <script>
-        $(document).ready(function() {
-            <?php
-                // Create Provenance select values array
-                foreach ($this->params['provenances'] as $uri => $provenance) {
-                    $provenancesArray[$uri] = $provenance->label . " (" . $uri . ")";
-                }
-                // Inject URI to get document widget linked to an URI
-                echo 'var documentsLoadUri = "' . Url::to(['document/get-documents-widget']) . '";';
-                // Inject provenances list indexed by URI
-                echo 'var provenances = ' . json_encode($this->params['provenances']) . ';';
-            ?>
-                
-            // Function to update provenance comment field depending of selected URI
-            var updateProvenanceFields = function(uri) {
-                if (provenances.hasOwnProperty(uri)) {
-                    // If selected provenance is known get its comment
-                    var comment = provenances[uri]["comment"];
-                    
-                    // Set provenance comment, disable input and remove validation messages 
-                    $("#yiidatasetmodel-provenancecomment").val(comment).attr("disabled", "disabled");
-                    $(".field-yiidatasetmodel-provenancecomment, .field-yiidatasetmodel-provenancecomment *")
-                        .removeClass("has-error")
-                        .removeClass("has-success");
-                    $(".field-yiidatasetmodel-provenancecomment .help-block").empty();
+            ]);
+        ?>
 
-                    // Load linked documents
-                    $("#already-linked-documents").load(documentsLoadUri, {
-                        "uri": uri
-                    })
-                } else {
-                    // Otherwise clear provenance comment and enable input
-                    $("#yiidatasetmodel-provenancecomment").val("").removeAttr("disabled");
+                <p>
+                <?php
+                    $csvPath = "coma";
+                    if (Yii::$app->params['csvSeparator'] == ";") {
+                        $csvPath = "semicolon";
+                    }
+                ?>
+                <i>
+    
+                </i>
+                </p>
+
+                <hr>
+                <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
+                    <br>
+                    <div class="alert alert-info" role="alert">
+                        <b><?= Yii::t('app/messages', 'File Rules') ?> : </b>
+                        <ul>
+                            <li><?= Yii::t('app/messages', 'CSV separator must be') ?> "<b><?= Yii::$app->params['csvSeparator'] ?></b>"</li>
+                            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be') ?> "<b>.</b>"</li>
+                        </ul>
+                        <br/>
+                        <b><?= Yii::t('app', 'Columns') ?> : </b>
+                        <table class="table table-hover" id="dataset-csv-columns-desc">
+                            <tr>
+                                <th style="color:red">ScientificObjectAlias *</th>
+                                <td><?= Yii::t('app/messages', 'The ALIAS of the scientific object for the choosen experiment (e.g MTP_WW_2019_P050_SH1_2018_LF14)') ?></td>
+                            </tr>
+                            <tr>
+                                <th style="color:red">Date *</th>
+                                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
+                            </tr>
+                            <tr class="dataset-variables">
+                                <th style="color:red">Variable value *</th>
+                                <td ><?= Yii::t('app', 'Variable value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
+                            </tr>
+                        </table>
+                    </div>               
                     
-                    // Clear linked documents list
-                    $("#already-linked-documents").empty();
-                }    
-            }
-            
-            // On provenance change update provenance fields
-            $("#provenance-selector").change(function() {
-                updateProvenanceFields($(this).val());
-            });
-            
-            // Update provenance fields depending of startup value
-            updateProvenanceFields($("#provenance-selector").val());
-        });
-    </script>
-    <?= $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(),[
-                'data' => $provenancesArray,
-                'options' => [
-                    'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
-                    'id' => 'provenance-selector',
-                    'multiple' => false
-                ],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'tags' => true
-                ],
-            ]); ?>
+        <?= 
+        Html::button(
+                Yii::t('app', 'Download Template'),
+                [
+                'id' => 'downloadDatasetTemplate',
+                'class' => 'btn btn-success'  
+                ]
+        );
+        ?>
+                <br><br>
+                </tab-content>
+                <tab-content title="<?= Yii::t('app','Describe the produced dataset') ?>"
+                                 icon="ti-settings"
+                                 :before-change="beforeUploadDataset">
+                       <h4><?= Yii::t('app', 'Provenance'); ?></h4>
+                <p class="alert alert-info"><?= Yii::t('app/messages', 'To create a new provenance, write the provenance label in the research field and press `Enter`. After you will be able to fill provenance input fields and create it by press `Create provenance` button.'); ?></p>
     
-    <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
-
-    <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
-    <div id="already-linked-documents"></div>
-   <?=  $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
-        'max'               => 6,
-        'allowEmptyList'    => true,
-        'enableGuessTitle'  => true,
-        'columns' => [
-            [
-                'name' => 'documentURI',
-                'options' => [
-                  'readonly' => true,
-                  'style' => 'background-color:#C4DAE7;',
-                 ]
-            ]
-        ],
-        'addButtonOptions' => [
-            'class' => 'btn btn-primary buttonDocuments',
-            'label' => Yii::t('app', 'Add Document')
-        ],
-    ])->label(false)
-    ?>
-
-
-
-    <hr style="border-color : gray;"/>
-
-      <div class="alert alert-info" role="alert">
-        <b><?= Yii::t('app/messages', 'File Rules')?> : </b>
-        <ul>
-            <li><?= Yii::t('app/messages', 'CSV separator must be')?> "<b><?= Yii::$app->params['csvSeparator']?></b>"</li>
-            <li><?= Yii::t('app/messages', 'Decimal separator for numeric values must be')?> "<b>.</b>"</li>
-        </ul>
-        <br/>
-        <b><?= Yii::t('app', 'Columns')?> : </b>
-        <table class="table table-hover" id="dataset-csv-columns-desc">
-            <tr>
-                <th style="color:red">ScientificObjectURI *</th>
-                <td><?= Yii::t('app/messages', 'The URI of the scientific object (e.g http://www.phenome-fppn.fr/phenovia/2017/o1028649)')?></td>
-            </tr>
-            <tr>
-                <th style="color:red">Date *</th>
-                <td><p><?= Yii::t('app/messages', 'Acquisition date of the data') ?> (format ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ssZ) </p> </td>
-            </tr>
-             <tr class="dataset-variables">
-                <th style="color:red">Value *</th>
-                <td ><?= Yii::t('app', 'Value') ?> (<?= Yii::t('app', 'Real number, String or Date') ?>)</td>
-            </tr>
-        </table>
-    </div>
-
-    <p>
-        <?php 
-            $csvPath = "coma";
-            if (Yii::$app->params['csvSeparator'] == ";") {
-                $csvPath = "semicolon";
-            }
+        <?=
+        $form->field($model, 'provenanceUri')->widget(\kartik\select2\Select2::classname(), [
+            'data' => $provenancesArray,
+            'options' => [
+                'placeholder' => Yii::t('app/messages', 'Select existing provenance or create a new one') . ' ...',
+                'id' => 'provenance-selector',
+                'multiple' => false
+            ],
+            'pluginOptions' => [
+                'allowClear' => true,
+                'tags' => true
+            ],
+        ]);
         ?>
-        <i><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Template'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetTemplate.csv', ['id' => 'downloadDatasetTemplate']) ?></i>
-        <i style="float: right"><?= Html::a("<span class=\"glyphicon glyphicon-download-alt\" aria-hidden=\"true\"></span> " . Yii::t('app', 'Download Example'), \config::path()['basePath'] . 'documents/DatasetFiles/' . $csvPath . '/datasetExemple.csv') ?></i>
-    </p>
-    <?= $form->field($model, 'file')->widget(FileInput::classname(), [
-        'options' => [
-            'maxFileSize' => 2000,
-            'pluginOptions'=>['allowedFileExtensions'=>['csv'],'showUpload' => false],
-        ]
-    ]);
-    ?>
 
-    <div class="form-group">
-        <?= Html::submitButton(Yii::t('yii' , 'Create') , ['class' => 'btn btn-success']) ?>
-    </div>
+        <?=
+        $form->field($model, 'provenanceAgents')->widget(\kartik\select2\Select2::classname(), [
+            'data' => $this->params['agents'],
+            'options' => [
+                'placeholder' => 'Select operator ...',
+                'multiple' => true
+            ],
+            'pluginOptions' => [
+                'allowClear' => true
+            ],
+        ]);
+        ?>
 
-    <?php ActiveForm::end(); ?>
+        <?= $form->field($model, 'provenanceComment')->textarea(['rows' => 6]) ?>
+
+                <h3><?= Yii::t('app', 'Linked Document(s)') ?></h3>
+                <div id="already-linked-documents"></div>
+        <?=
+        $form->field($model, 'documentsURIs')->widget(MultipleInput::className(), [
+            'max' => 6,
+            'allowEmptyList' => true,
+            'enableGuessTitle' => true,
+            'columns' => [
+                [
+                    'name' => 'documentURI',
+                    'options' => [
+                        'readonly' => true,
+                        'style' => 'background-color:#C4DAE7;',
+                    ]
+                ]
+            ],
+            'addButtonOptions' => [
+                'class' => 'btn btn-primary buttonDocuments',
+                'label' => Yii::t('app', 'Add Document'),            
+            ],
+        ])->label(false)
+        ?>
+        <br>
+        <?= Html::button(Yii::t('app', 'Create provenance'), ['class' => 'btn btn-success','onclick' => 'saveOrUpdateProvenance()', 'id' => 'saveProvenanceButton']) ?>
+        <br>
+        <br>
+
+                </tab-content>
+                <tab-content title="<?= Yii::t('app','Upload dataset'); ?>"
+                             icon="ti-check"
+                             :before-change="beforeUploadData">
+                <h3><i>  <?= Yii::t('app', 'Dataset input file') ?></i></h3>
+
+            <?=
+            $form->field($model, 'file')->widget(FileInput::classname(), [
+                'options' => [
+                    'maxFileSize' => 2000,
+                    'id' => 'dataset-file-uploader',
+                    'pluginOptions' => ['allowedFileExtensions' => ['csv'], 'showUpload' => false],
+                ]
+            ]);
+            ?>
 
-    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="document-content"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
-                     <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+                        <div class="form-group">
+                        </div>
+                        </div>
+        <?php ActiveForm::end(); ?>
+                    </tab-content>
+                </form-wizard>
+                    <div class="modal fade" id="document-modal" tabindex="-1" role="dialog" aria-labelledby="document-modal-title">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title" id="document-modal-title"><?php echo Html::encode(Yii::t('app', 'Create Document')); ?></h4>
+                            </div>
+                            <div class="modal-body">
+                                <div id="document-content"></div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-success" id="document-save"><?php echo Html::encode(Yii::t('yii', 'Create')) ?></button>
+                                <button type="button" class="btn btn-default modal-close" data-dismiss="modal"><?php echo Html::encode(Yii::t('yii', 'Close')) ?></button>
+                            </div>
+                        </div>
+                    </div>
                 </div>
+            </template>
             </div>
         </div>
     </div>
-
+    <div>
     <script>
-    $(document).ready(function(){
+        $(document).ready(function () {
+            Vue.use(VueFormWizard)
+            var formVue = new Vue({
+             el: '#app',
+             data:{
+                loadingWizard: false
+             },
+             methods: {
+                onComplete: function(){
+                    this.loadingWizard = true;
+                    $("#<?= $form->getId() ?>").submit();
+                    $("button.wizard-btn").attr('disabled','disabled');
+                },
+                setLoading: function(value) {
+                      this.loadingWizard = value;
+                },
+                handleValidation: function(isValid, tabIndex){
+                      console.log('Tab: '+tabIndex+ ' valid: '+isValid)
+                },
+                beforeSelectProvenance: function(){
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                              let experimentUri = $("#experiment-selector").val();
+                              
+                              if(experimentUri === undefined || experimentUri === null || experimentUri === ""|| !experiments.hasOwnProperty(experimentUri)){
+                                  toastr.warning("You must select a valid experiment to be able to continue");
+                                  reject("You must select a valid experiment to be able to continue");
+                              }else{
+                                 resolve(true);
+                                }   
+                              }, 200)
+                      });
+                  },
+                  beforeUploadDataset: function(){
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                              let provenanceUri = $("#provenance-selector").val();
+                              if(provenanceUri === undefined ||
+                                      provenanceUri === null ||
+                                      provenanceUri === "" ||
+                                      !provenances.hasOwnProperty(provenanceUri)){
+                                  toastr.warning("You must select a valid provenance to be able to continue");
+                                  reject("You must select a valid provenance to continue");
+                              }else{
+                                 resolve(true);
+                                }   
+                              }, 200)
+                      });
+                  },
+                  beforeUploadData: function(){
+                      return new Promise((resolve, reject) => {
+                          setTimeout(() => {
+                               console.log($('#dataset-file-uploader').fileinput('getFilesCount'));
+                                var fileCount = $('#dataset-file-uploader').fileinput('getFilesCount');
+                                if(fileCount === 1){
+                                    formVue.loadingWizard = false;
+                                      resolve(true);
+                                }else{
+                                     toastr.warning("You must select a valid data file to be able to continue");
+                                  reject("You must select a valid provenance to continue");
+                                  
+                                }
+                              }, 200)
+                      });
+                  }
+              }
+        });
+            
         // Load document add form popin
         $('#document-content').load('<?php echo Url::to(['document/create-from-dataset']) ?>');
-        
+
         var documentUploaded = false;
         // Clear last uploaded document line if document add form is canceled
         $('#document-modal').on('hidden.bs.modal', function () {
@@ -267,7 +678,7 @@
                 $(".js-input-remove:last").click();
             }
             documentUploaded = false;
-            
+
             $('#document-content form').trigger('reset');
 
             $('#document-save-msg').parent().removeClass('alert-danger');
@@ -275,88 +686,147 @@
             $('#document-save-msg').html('<?php echo Yii::t('app/messages', 'Request text'); ?>');
         });
 
-        $(document).on('change', '#uriVariable-selector', function() {
-            $(".dataset-variables").remove();
-              $("#uriVariable-selector :selected").each(function (i,sel) {
-                    $('#dataset-csv-columns-desc').append(
-                            '<tr class="dataset-variables">'
-                                + '<th style="color:red" >'
-                                    + $(sel).text() + ' *'
-                                + '</th>'
-                                + '<td>'
-                                    + '<?php echo Yii::t("app/messages", "Value"); ?> (<?php echo Yii::t('app', 'Real number, String or Date'); ?>)'
-                                + '</td>'
-                            + '</tr>');
-                  });
+        $(document).on('change', '#uriVariable-selector', function () {
+           refreshRules();
         });
 
         // Initial document count
         var nbDocuments = -1;
+        
+          // Open document add form on click
+        $('.buttonDocuments').click(function () {
+            console.log("click")
+            nbDocuments++;
+            typeInsertedDocument = "document";
+            $('#document-modal').modal('toggle');
+        });
+
         $(document).on('click', '#document-save', function () {
-                // On save get document form values
-                var formData = new FormData();
-                var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
-                formData.append('file', file_data);
-                var other_data = $('form').serializeArray();
-                $.each(other_data, function(key, input) {
-                    formData.append(input.name, input.value);
-                });
+            // On save get document form values
+            var formData = new FormData();
+            var file_data = $('#document-content #yiidocumentmodel-file').prop('files')[0];
+            formData.append('file', file_data);
+            var other_data = $('form').serializeArray();
+            $.each(other_data, function (key, input) {
+                formData.append(input.name, input.value);
+            });
 
-                // Send documents form
-                $.ajax({
-                    url: 'index.php?r=document%2Fcreate-from-dataset',
-                    type: 'POST',
-                    processData: false,
-                    datatype: 'json',
-                    contentType: false,
-                    data: formData
+            // Send documents form
+            $.ajax({
+                url: '<?= Url::to(['document/create-from-dataset']);?>',
+                type: 'POST',
+                processData: false,
+                datatype: 'json',
+                contentType: false,
+                data: formData
 
-                })
-                .done(function (data) {
+            })
+            .done(function (data) {
                     // Add document URI and close document add form
                     $('#yiidatasetmodel-documentsuris-documenturi-' + nbDocuments).val(data);
                     documentUploaded = true;
                     $('#document-modal').modal('toggle');
 
-                })
-                .fail(function (jqXHR, textStatus) {
+            })
+            .fail(function (jqXHR, textStatus) {
                     // Disaply errors
                     $('#document-save-msg').parent().removeClass('alert-info');
                     $('#document-save-msg').parent().addClass('alert-danger');
                     $('#document-save-msg').html('Request failed: ' + textStatus);
-                });
-                
-                return false;
-        });
-
-        // Open document add form on click
-        $('.buttonDocuments').click(function() {
-            nbDocuments++;
-            typeInsertedDocument = "document";
-            $('#document-modal').modal('toggle');
+            });
+            return false;
         });
 
+      
         // Download adjusted to variables CSV template file on click
-        $(document).on('change', '#uriVariable-selector', function () {
+        $(document).on('click', '#downloadDatasetTemplate', function (event) {
+            event.preventDefault();
             var variablesLabels = [];
-            $("#uriVariable-selector :selected").each(function (i,sel) {
+            $("#uriVariable-selector :selected").each(function (i, sel) {
                 variablesLabels.push($(sel).text());
-              });
-            $.ajax({
-                url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
-                type: 'POST',
-                datatype: 'json',
-                data: {variables: variablesLabels}
-            })
-                    .done(function (data) {
-                    })
-                    .fail(function (jqXHR, textStatus) {
-                        $('#document-save-msg').parent().removeClass('alert-info');
-                        $('#document-save-msg').parent().addClass('alert-danger');
-                        $('#document-save-msg').html('Request failed: ' + textStatus);
-                    });
+            });
+            if(variablesLabels.length > 0){
+                $.ajax({
+                    url: 'index.php?r=dataset%2Fgenerate-and-download-dataset-creation-file',
+                    type: 'POST',
+                    datatype: 'json',
+                    data: {variables: variablesLabels}
+                })
+                .done(function (csvContent) {
+                    console.log(csvContent);
+                    download(csvContent, 'datasetTemplate.csv', 'text/csv;encoding:utf-8');
+                })
+                .fail(function (jqXHR, textStatus) {
+                    $('#document-save-msg').parent().removeClass('alert-info');
+                    $('#document-save-msg').parent().addClass('alert-danger');
+                    $('#document-save-msg').html('Request failed: ' + textStatus);
+                });
+            }else{
+                toastr.warning("You must selected at least one variable");
+            }
         });
-
-    });
+        
+        // On provenance change update provenance fields
+        $("#experiment-selector").change(function () {
+             populateVariableList($(this).val());
+        });
+        populateVariableList($("#experiment-selector").val());
+        
+        // On provenance change update provenance fields
+        $("#provenance-selector").change(function () {
+            updateProvenanceFields($(this).val());
+        });
+        
+        
+        // Update provenance fields depending of startup value
+        updateProvenanceFields($("#provenance-selector").val());
+     });    
+     
+   
     </script>
+    <style>
+        /* This is a css loader. It's not related to vue-form-wizard */
+        .loader,
+        .loader:after {
+          border-radius: 50%;
+          width: 10em;
+          height: 10em;
+        }
+        .loader {
+          margin: 60px auto;
+          font-size: 10px;
+          position: relative;
+          text-indent: -9999em;
+          border-top: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-right: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-bottom: 1.1em solid rgba(255, 255, 255, 0.2);
+          border-left: 1.1em solid #0033ff;
+          -webkit-transform: translateZ(0);
+          -ms-transform: translateZ(0);
+          transform: translateZ(0);
+          -webkit-animation: load8 1.1s infinite linear;
+          animation: load8 1.1s infinite linear;
+        }
+        @-webkit-keyframes load8 {
+          0% {
+            -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+          }
+          100% {
+            -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+          }
+        }
+        @keyframes load8 {
+          0% {
+            -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+          }
+          100% {
+            -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+          }
+        }
+    </style>
 </div>
+</div>
\ No newline at end of file
diff --git a/views/dataset/create.php b/views/dataset/create.php
old mode 100755
new mode 100644
index ba9d5592..6b79a8d5
--- a/views/dataset/create.php
+++ b/views/dataset/create.php
@@ -19,7 +19,7 @@
 /* @var $handsontable openSILEX\handsontablePHP\adapter\HandsontableSimple */
 /* @var $handsontableErrorsCellsSettings string */
 
-$this->title = Yii::t('app', 'Add Dataset');
+$this->title = Yii::t('app', 'Add Dataset on scientific object');
 //$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Dataset', ['n' => 2]), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 1b7efcd6..fb14e23f 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -107,7 +107,7 @@
                             'label' => Yii::t('app', 'Data'),
                             'items' => [
                                 [
-                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add'),
+                                    'label' => Icon::show('plus', ['class' => 'fa-large'], Icon::FA) . " " . Yii::t('app', 'Add on scientific object'),
                                     'url' => ['/dataset/create']
                                 ],
                                 [
diff --git a/web/documents/DatasetFiles/coma/datasetExemple.csv b/web/documents/DatasetFiles/coma/datasetExemple.csv
old mode 100644
new mode 100755
index 0f00b05b..9c670954
--- a/web/documents/DatasetFiles/coma/datasetExemple.csv
+++ b/web/documents/DatasetFiles/coma/datasetExemple.csv
@@ -1,8 +1,8 @@
-ScientificObjectURI,Date,trait-1_method-A_dimensionless-unit,trait-2_method-B_dimensionless-unit,trait-3_method-C_dimensionless-unit
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-12T15:51:00Z,2019-09-12,"red",-12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-13T12:51:00Z,2019-09-13,"red",13e12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-14T18:51:00Z,2019-09-14,"red",-0.000000000000000141
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-15T10:51:00Z,2019-09-15,"blue",-0.15
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-16T09:51:00Z,2019-09-16,"red",16
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035,2019-09-17T08:51:30Z,2019-09-17,"blue",17
+ScientificObjectAlias,Date,trait-1_method-A_dimensionless-unit,trait-2_method-B_dimensionless-unit,trait-3_method-C_dimensionless-unit
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-12T15:51:00Z,2019-09-12,"red",-12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-13T12:51:00Z,2019-09-13,"red",13e12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-14T18:51:00Z,2019-09-14,"red",-0.000000000000000141
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-15T10:51:00Z,2019-09-15,"blue",-0.15
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-16T09:51:00Z,2019-09-16,"red",16
+7/DKC4590/XXXX/WW/1/DIA2017-05-19,2019-09-17T08:51:30Z,2019-09-17,"blue",17
 
diff --git a/web/documents/DatasetFiles/coma/datasetTemplate.csv b/web/documents/DatasetFiles/coma/datasetTemplate.csv
old mode 100644
new mode 100755
index a84d9634..5ddeb877
--- a/web/documents/DatasetFiles/coma/datasetTemplate.csv
+++ b/web/documents/DatasetFiles/coma/datasetTemplate.csv
@@ -1 +1 @@
-ScientificObjectURI,Date,Value
+ScientificObjectAlias,Date
diff --git a/web/documents/DatasetFiles/semicolon/datasetExemple.csv b/web/documents/DatasetFiles/semicolon/datasetExemple.csv
old mode 100644
new mode 100755
index 00876924..1fe6a76e
--- a/web/documents/DatasetFiles/semicolon/datasetExemple.csv
+++ b/web/documents/DatasetFiles/semicolon/datasetExemple.csv
@@ -1,8 +1,8 @@
-ScientificObjectURI;Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-12T15:51:00Z;2019-09-12;"red";-12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-13T12:51:00Z;2019-09-13;"red";13e12
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-16T09:51:00Z;2019-09-16;"red";16
-http://www.phenome-fppn.fr/mtpvm/2019/o19000035;2019-09-17T08:51:30Z;2019-09-17;"blue";17
+ScientificObjectAlias;Date;trait-1_method-A_dimensionless-unit;trait-2_method-B_dimensionless-unit;trait-3_method-C_dimensionless-unit
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-12T15:51:00Z;2019-09-12;"red";-12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-13T12:51:00Z;2019-09-13;"red";13e12
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-14T18:51:00Z;2019-09-14;"red";-0.000000000000000141
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-15T10:51:00Z;2019-09-15;"blue";-0.15
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-16T09:51:00Z;2019-09-16;"red";16
+7/DKC4590/XXXX/WW/1/DIA2017-05-19;2019-09-17T08:51:30Z;2019-09-17;"blue";17
 
diff --git a/web/documents/DatasetFiles/semicolon/datasetTemplate.csv b/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
old mode 100644
new mode 100755
index 1e17cded..2091cc97
--- a/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
+++ b/web/documents/DatasetFiles/semicolon/datasetTemplate.csv
@@ -1 +1 @@
-ScientificObjectURI;Date;Value
+ScientificObjectAlias;Date;Variable value