support ScilabBoolean, ScilabDouble, ScilabString

65 files changed, 675 insertions, 609 deletions

diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 15cccf2a..72b26ff8 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -2,16 +2,16 @@
 function CLKINV_f() {
     CLKINV_f.prototype.define = function CLKINV_f() {
         this.prt = 1;
-        model = scicos_model();
-        model.sim = "input";
-        model.evtout = 1;
-        model.ipar = this.prt;
-        model.blocktype = "d";
-        model.firing = -1;
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("input");
+        this.model.evtout = new ScilabDouble(1);
+        this.model.ipar = new ScilabDouble(this.prt);
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = new ScilabDouble(-1);
+        this.model.dep_ut = [false,false];
         exprs = string(this.prt);
         gr_i = [];
-        this.x = standard_define([1,1],model,exprs,gr_i);
+        this.x = standard_define([1,1],this.model,exprs,gr_i);
         return new EventInBlock(this.x);
     }
     CLKINV_f.prototype.details = function CLKINV_f() {
@@ -26,7 +26,7 @@ function CLKINV_f() {
         this.prt = parseFloat(arguments[0]["prt"])
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         exprs = exprs[1-1];
         while (true) {
@@ -38,12 +38,12 @@ function CLKINV_f() {
             if (this.prt<=0) {
                 block_parameter_error(msprintf("Wrong values for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected.");
             } else {
-                model.ipar = this.prt;
-                model.evtout = 1;
-                model.firing = -1;
+                this.model.ipar = new ScilabDouble(this.prt);
+                this.model.evtout = new ScilabDouble(1);
+                this.model.firing = new ScilabDouble(-1);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle
index 114fe3c1..bc5efd27 100644
--- a/js/Sources/CLKINV_f.pickle
+++ b/js/Sources/CLKINV_f.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'prt'
+aS'model'
 p3
-atp4
-Rp5
+aS'prt'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index 08373047..03f3c741 100644
--- a/js/Sources/CLKIN_f.js
+++ b/js/Sources/CLKIN_f.js
@@ -2,15 +2,15 @@
 function CLKIN_f() {
     CLKIN_f.prototype.define = function CLKIN_f() {
         this.prt = 1;
-        model = scicos_model();
-        model.sim = "input";
-        model.evtout = 1;
-        model.ipar = this.prt;
-        model.blocktype = "d";
-        model.firing = -1;
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("input");
+        this.model.evtout = new ScilabDouble(1);
+        this.model.ipar = new ScilabDouble(this.prt);
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = new ScilabDouble(-1);
+        this.model.dep_ut = [false,false];
         exprs = string(this.prt);
-        this.x = standard_define([1,1],model,exprs," ");
+        this.x = standard_define([1,1],this.model,exprs," ");
         return new BasicBlock(this.x);
     }
     CLKIN_f.prototype.details = function CLKIN_f() {
@@ -25,7 +25,7 @@ function CLKIN_f() {
         this.prt = parseFloat(arguments[0]["prt"])
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         exprs = exprs[1-1];
         while (true) {
@@ -37,12 +37,12 @@ function CLKIN_f() {
             if (this.prt<=0) {
                 message("Port number must be a positive integer");
             } else {
-                model.ipar = this.prt;
-                model.evtout = 1;
-                model.firing = -1;
+                this.model.ipar = new ScilabDouble(this.prt);
+                this.model.evtout = new ScilabDouble(1);
+                this.model.firing = new ScilabDouble(-1);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle
index 39b30975..b7886c50 100644
--- a/js/Sources/CLKIN_f.pickle
+++ b/js/Sources/CLKIN_f.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'prt'
+aS'model'
 p3
-atp4
-Rp5
+aS'prt'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 97df9d39..bb04a18a 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -66,10 +66,10 @@ function CLOCK_c() {
         newpar = list();
         xx = arg1.model.rpar.objs[path-1];
         exprs = xx.graphics.exprs;
-        model = xx.model;
-        t0_old = model.firing;
-        dt_old = model.rpar[1-1];
-        model_n = model;
+        this.model = xx.model;
+        t0_old = this.model.firing;
+        dt_old = this.model.rpar[1-1];
+        model_n = this.model;
         while (true) {
             [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],["&nbsp; Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),exprs);
             if (!ok) {
@@ -81,9 +81,9 @@ function CLOCK_c() {
             }
             if (ok) {
                 xx.graphics.exprs = this.exprs0;
-                model.rpar = [[this.dt],[this.t0]];
-                model.firing = this.t0;
-                xx.model = model;
+                this.model.rpar = [[this.dt],[this.t0]];
+                this.model.firing = new ScilabDouble(this.t0);
+                xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
             }
diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle
index c0628324..1b13bb38 100644
--- a/js/Sources/CLOCK_c.pickle
+++ b/js/Sources/CLOCK_c.pickle
@@ -4,14 +4,16 @@ p0
 ((lp1
 S'x'
 p2
-aS'dt'
+aS'model'
 p3
-aS'exprs0'
+aS'dt'
 p4
 aS't0'
 p5
-atp6
-Rp7
+aS'exprs0'
+p6
+atp7
+Rp8
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 2f7509a5..c387dbca 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -66,10 +66,10 @@ function CLOCK_f() {
         newpar = list();
         xx = arg1.model.rpar.objs[path-1];
         exprs = xx.graphics.exprs;
-        model = xx.model;
-        t0_old = model.firing;
-        dt_old = model.rpar;
-        model_n = model;
+        this.model = xx.model;
+        t0_old = this.model.firing;
+        dt_old = this.model.rpar;
+        model_n = this.model;
         while (true) {
             [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock  block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs);
             if (!ok) {
@@ -81,9 +81,9 @@ function CLOCK_f() {
             }
             if (ok) {
                 xx.graphics.exprs = this.exprs0;
-                model.rpar = this.dt;
-                model.firing = this.t0;
-                xx.model = model;
+                this.model.rpar = new ScilabDouble(this.dt);
+                this.model.firing = new ScilabDouble(this.t0);
+                xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
             }
diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle
index d1dda939..c7f5264f 100644
--- a/js/Sources/CLOCK_f.pickle
+++ b/js/Sources/CLOCK_f.pickle
@@ -4,14 +4,16 @@ p0
 ((lp1
 S'x'
 p2
-aS'dt'
+aS'model'
 p3
-aS'exprs0'
+aS'dt'
 p4
 aS't0'
 p5
-atp6
-Rp7
+aS'exprs0'
+p6
+atp7
+Rp8
 .(dp0
 S'diagram.objs[1-1]'
 p1
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 34c1ca06..af405b98 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -2,16 +2,16 @@
 function CONST() {
     CONST.prototype.define = function CONST() {
         this.C = 1;
-        model = scicos_model();
-        model.sim = list("cstblk4",4);
-        model.in1 = [];
-        model.out = 1;
-        model.rpar = this.C;
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("cstblk4",4);
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = new ScilabDouble(this.C);
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = strcat(sci2exp(this.C));
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONST.prototype.details = function CONST() {
@@ -27,7 +27,7 @@ function CONST() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
             if (!ok) {
@@ -40,11 +40,11 @@ function CONST() {
             } else if (and(sz>1)) {
                 message("C matrix is not supported, use CONST_m instead");
             } else {
-                model.rpar = this.C.slice();
-                model.out = nout;
+                this.model.rpar = this.C.slice();
+                this.model.out = new ScilabDouble(nout);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle
index 9e82cdd4..4fea4b94 100644
--- a/js/Sources/CONST.pickle
+++ b/js/Sources/CONST.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'C'
+aS'model'
 p3
-atp4
-Rp5
+aS'C'
+p4
+atp5
+Rp6
 .(dp0
 S'sz'
 p1
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 900a953b..edc52303 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -2,16 +2,16 @@
 function CONST_f() {
     CONST_f.prototype.define = function CONST_f() {
         this.C = 1;
-        model = scicos_model();
-        model.sim = list("cstblk",1);
-        model.in1 = [];
-        model.out = 1;
-        model.rpar = this.C;
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("cstblk",1);
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = new ScilabDouble(this.C);
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = strcat(sci2exp(this.C));
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONST_f.prototype.details = function CONST_f() {
@@ -27,7 +27,7 @@ function CONST_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
             if (!ok) {
@@ -37,11 +37,11 @@ function CONST_f() {
             if (nout==0) {
                 message("C must have at least one element");
             } else {
-                model.rpar = this.C.slice();
-                model.out = nout;
+                this.model.rpar = this.C.slice();
+                this.model.out = new ScilabDouble(nout);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle
index ab138cac..503aafba 100644
--- a/js/Sources/CONST_f.pickle
+++ b/js/Sources/CONST_f.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'C'
+aS'model'
 p3
-atp4
-Rp5
+aS'C'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 2c187bf2..5fea4537 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -2,19 +2,19 @@
 function CONST_m() {
     CONST_m.prototype.define = function CONST_m() {
         this.C = [1];
-        model = scicos_model();
-        model.sim = list("cstblk4",4);
-        model.in1 = [];
-        model.out = size(this.C,1);
-        model.in2 = [];
-        model.out2 = size(this.C,2);
-        model.rpar = this.C;
-        model.opar = list();
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("cstblk4",4);
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(size(this.C,1));
+        this.model.in2 = [];
+        this.model.out2 = new ScilabDouble(size(this.C,2));
+        this.model.rpar = this.C;
+        this.model.opar = list();
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = sci2exp(this.C);
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     CONST_m.prototype.details = function CONST_m() {
@@ -30,7 +30,7 @@ function CONST_m() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.C,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),exprs);
             if (!ok) {
@@ -40,8 +40,8 @@ function CONST_m() {
             if (find(nout==0)!=[]) {
                 block_parameter_error(msprintf("Wrong size for \'%s\' parameter","Constant Value"),"Constant value must have at least one element.");
             } else {
-                model.sim = list("cstblk4_m",4);
-                model.opar = list(this.C);
+                this.model.sim = list("cstblk4_m",4);
+                this.model.opar = list(this.C);
                 if ((this.type[this.C-1]==1)) {
                     if (isreal(this.C)) {
                         ot = 1;
@@ -65,11 +65,11 @@ function CONST_m() {
                     ok = false;
                 }
                 if (ok) {
-                    model.rpar = [];
-                    [model,graphics,ok] = set_io(model,graphics,list(),list(nout,ot),[],[]);
+                    this.model.rpar = [];
+                    [model,graphics,ok] = set_io(this.model,graphics,list(),list(nout,ot),[],[]);
                     graphics.exprs = exprs;
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle
index 43d820e8..20600687 100644
--- a/js/Sources/CONST_m.pickle
+++ b/js/Sources/CONST_m.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'C'
+aS'model'
 p3
 aS'type'
 p4
-atp5
-Rp6
+aS'C'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle
index cf6add0f..a510c446 100644
--- a/js/Sources/CURVE_c.pickle
+++ b/js/Sources/CURVE_c.pickle
@@ -4,30 +4,32 @@ p0
 ((lp1
 S'rparin'
 p2
-aS'yy'
+aS'curwin'
 p3
-aS'xx'
+aS'yy'
 p4
-aS'ixy'
+aS'xx'
 p5
-aS'PeriodicOption'
+aS'ixy'
 p6
-aS'argn'
+aS'graf'
 p7
-aS'xy'
+aS'argn'
 p8
-aS'x'
+aS'xy'
 p9
-aS'curwin'
+aS'x'
 p10
-aS'Method'
+aS'model'
 p11
-aS'graf'
+aS'Method'
 p12
-aS'iparin'
+aS'PeriodicOption'
 p13
-atp14
-Rp15
+aS'iparin'
+p14
+atp15
+Rp16
 .(dp0
 S'mean4'
 p1
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index f3d042a8..67f997cb 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -7,16 +7,16 @@ function CURV_f() {
         axisdata = [[2],[10],[2],[10]];
         ipar = [[size(xx,1)],[axisdata.slice()]];
         rpar = [[xx],[yy],[rect.slice()]];
-        model = scicos_model();
-        model.sim = "intplt";
-        model.in1 = [];
-        model.out = 1;
-        model.rpar = [[xx],[yy],[rect.slice()]];
-        model.ipar = [[size(xx,1)],[axisdata.slice()]];
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("intplt");
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = [[xx],[yy],[rect.slice()]];
+        this.model.ipar = [[size(xx,1)],[axisdata.slice()]];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     CURV_f.prototype.details = function CURV_f() {
@@ -29,10 +29,10 @@ function CURV_f() {
     }
     CURV_f.prototype.set = function CURV_f() {
         this.x = arg1;
-        model = arg1.model;
+        this.model = arg1.model;
         graphics = arg1.graphics;
-        rpar = model.rpar;
-        ipar = model.ipar;
+        rpar = this.model.rpar;
+        ipar = this.model.ipar;
         n = ipar[1-1];
         xx = rpar.slice(1-1,n);
         yy = rpar.slice(n+1-1,2*n);
@@ -53,14 +53,14 @@ function CURV_f() {
                 ok = false;
             }
             if (ok) {
-                model.sim = "intplt";
-                model.firing = [];
+                this.model.sim = new ScilabString("intplt");
+                this.model.firing = [];
                 rect = gc[1-1];
-                model.rpar = [[xx.slice()],[yy.slice()],[rect.slice()]];
+                this.model.rpar = [[xx.slice()],[yy.slice()],[rect.slice()]];
                 axisdata = gc[2-1];
-                model.ipar = [[size(xx,"*")],[axisdata.slice()]];
+                this.model.ipar = [[size(xx,"*")],[axisdata.slice()]];
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle
index 9d4622db..12a93f4d 100644
--- a/js/Sources/CURV_f.pickle
+++ b/js/Sources/CURV_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index 5ef219d4..4053bfb2 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -4,18 +4,18 @@ function Counter() {
         this.minim = 0;
         this.maxim = 2;
         this.rule = 1;
-        model = scicos_model();
-        model.sim = list("counter",4);
-        model.evtin = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.dstate = 0;
-        model.ipar = [[this.rule],[this.maxim],[this.minim]];
-        model.blocktype = "c";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("counter",4);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.ipar = [[this.rule],[this.maxim],[this.minim]];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,false];
         exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     Counter.prototype.details = function Counter() {
@@ -36,7 +36,7 @@ function Counter() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.minim,this.maxim,this.rule,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -50,10 +50,10 @@ function Counter() {
                 block_parameter_error(msprintf("Wrong value for \'Rule\' parameter: %d",this.rule),msprintf("Must be in the interval %s.","[1,2]"));
             } else {
                 graphics.exprs = exprs;
-                model.dstate = 0;
-                model.ipar = [[this.rule],[this.maxim],[this.minim]];
+                this.model.dstate = new ScilabDouble(0);
+                this.model.ipar = [[this.rule],[this.maxim],[this.minim]];
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle
index 52822486..b3bc225a 100644
--- a/js/Sources/Counter.pickle
+++ b/js/Sources/Counter.pickle
@@ -4,14 +4,16 @@ p0
 ((lp1
 S'x'
 p2
-aS'maxim'
+aS'model'
 p3
-aS'rule'
+aS'maxim'
 p4
-aS'minim'
+aS'rule'
 p5
-atp6
-Rp7
+aS'minim'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 3645aad4..e12c0852 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -6,9 +6,9 @@ function FROMWSB() {
         scs_m_1.objs[2-1] = scicos_link(xx=[[295.37067],[295.37067],[233.23733],[233.23733],[295.37067],[295.37067]],yy=[[255.86971],[223.45067],[223.45067],[337.85067],[337.85067],[307.29829]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
         scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
-        model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
+        this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
         gr_i = [];
-        this.x = standard_define([5,2],model,[],gr_i);
+        this.x = standard_define([5,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     FROMWSB.prototype.details = function FROMWSB() {
@@ -41,40 +41,40 @@ function FROMWSB() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (!this.isequalbitwise[this.xxn-1][xx-1]) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+                    modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label);
+                    if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) {
                         needcompile = 1;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+                    if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) {
                         needcompile = 4;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;
diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle
index 25f3b09a..26da62eb 100644
--- a/js/Sources/FROMWSB.pickle
+++ b/js/Sources/FROMWSB.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'xxn'
+aS'model'
 p3
-aS'isequalbitwise'
+aS'xxn'
 p4
-atp5
-Rp6
+aS'isequalbitwise'
+p5
+atp6
+Rp7
 .(dp0
 S'ppath'
 p1
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 00630b65..4b058495 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -5,20 +5,20 @@ function FROMWS_c() {
         this.Method = 1;
         this.ZC = 1;
         this.OutEnd = 0;
-        model = scicos_model();
-        model.sim = list("fromws_c",4);
-        model.out = -1;
-        model.out2 = -2;
-        model.outtyp = -1;
-        model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]];
-        model.evtin = [1];
-        model.evtout = [1];
-        model.firing = [0];
-        model.blocktype = "d";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("fromws_c",4);
+        this.model.out = new ScilabDouble(-1);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.outtyp = new ScilabDouble(-1);
+        this.model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]];
+        this.model.evtin = [1];
+        this.model.evtout = [1];
+        this.model.firing = [0];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,true];
         gr_i = [];
         exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]];
-        this.x = standard_define([3.5,2],model,exprs,gr_i);
+        this.x = standard_define([3.5,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     FROMWS_c.prototype.details = function FROMWS_c() {
@@ -41,7 +41,7 @@ function FROMWS_c() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.varnam,this.Method,this.ZC,this.OutEnd,exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -66,12 +66,12 @@ function FROMWS_c() {
                 ok = false;
             }
             if (ok) {
-                model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]];
-                [model,graphics,ok] = set_io(model,graphics,list(),list([-1,-2],-1),1,1);
+                this.model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]];
+                [model,graphics,ok] = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1);
                 if (ok) {
                     graphics.exprs = exprs;
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle
index 1da2a6de..ea260d7b 100644
--- a/js/Sources/FROMWS_c.pickle
+++ b/js/Sources/FROMWS_c.pickle
@@ -10,12 +10,14 @@ aS'OutEnd'
 p4
 aS'x'
 p5
-aS'Method'
+aS'model'
 p6
-aS'varnam'
+aS'Method'
 p7
-atp8
-Rp9
+aS'varnam'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index 93ce008b..b602ea6e 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -2,18 +2,18 @@
 function GENSIN_f() {
     GENSIN_f.prototype.define = function GENSIN_f() {
         rpar = [[1],[1],[0]];
-        model = scicos_model();
-        model.sim = "gensin";
-        model.in1 = [];
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.rpar = [[1],[1],[0]];
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("gensin");
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.rpar = [[1],[1],[0]];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     GENSIN_f.prototype.details = function GENSIN_f() {
@@ -34,7 +34,7 @@ function GENSIN_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.M,this.F,this.P,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -45,13 +45,13 @@ function GENSIN_f() {
                 ok = false;
             }
             if (ok) {
-                [model,graphics,ok] = check_io(model,graphics,[],1,[],[]);
-                model.rpar = [[this.M],[this.F],[this.P]];
-                model.out2 = 1;
-                model.outtyp = 1;
+                [model,graphics,ok] = check_io(this.model,graphics,[],1,[],[]);
+                this.model.rpar = [[this.M],[this.F],[this.P]];
+                this.model.out2 = new ScilabDouble(1);
+                this.model.outtyp = new ScilabDouble(1);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle
index 8e00c76e..4176a2e1 100644
--- a/js/Sources/GENSIN_f.pickle
+++ b/js/Sources/GENSIN_f.pickle
@@ -4,14 +4,16 @@ p0
 ((lp1
 S'x'
 p2
-aS'M'
+aS'model'
 p3
-aS'P'
+aS'M'
 p4
-aS'F'
+aS'P'
 p5
-atp6
-Rp7
+aS'F'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index d4dbe567..3cffcef1 100644
--- a/js/Sources/GENSQR_f.js
+++ b/js/Sources/GENSQR_f.js
@@ -2,18 +2,18 @@
 function GENSQR_f() {
     GENSQR_f.prototype.define = function GENSQR_f() {
         this.Amplitude = 1;
-        model = scicos_model();
-        model.sim = "gensqr";
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.evtin = 1;
-        model.dstate = this.Amplitude;
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("gensqr");
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(this.Amplitude);
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = string(this.Amplitude);
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     GENSQR_f.prototype.details = function GENSQR_f() {
@@ -30,7 +30,7 @@ function GENSQR_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")==2) {
             exprs = exprs[2-1];
         }
@@ -40,11 +40,11 @@ function GENSQR_f() {
                 break;
             }
             graphics.exprs = exprs;
-            model.dstate = this.Amplitude;
-            model.out2 = 1;
-            model.outtyp = 1;
+            this.model.dstate = new ScilabDouble(this.Amplitude);
+            this.model.out2 = new ScilabDouble(1);
+            this.model.outtyp = new ScilabDouble(1);
             this.x.graphics = graphics;
-            this.x.model = model;
+            this.x.model = this.model;
             break;
         }
         return new BasicBlock(this.x);
diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle
index d6df150f..b43e515b 100644
--- a/js/Sources/GENSQR_f.pickle
+++ b/js/Sources/GENSQR_f.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'Amplitude'
+aS'model'
 p3
-atp4
-Rp5
+aS'Amplitude'
+p4
+atp5
+Rp6
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index d6a3d32a..509cf149 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -18,36 +18,36 @@ function GEN_SQR() {
         scs_m_1.objs[14-1] = scicos_link(xx=[[164.84097],[184.40238]],yy=[[289.42294],[288.75198]],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[13,1,1]);
         scs_m_1.objs[15-1] = scicos_block(gui="SampleCLK",graphics=scicos_graphics(orig=[18.313686,403.57431],sz=[60,40],flip=true,theta=0,exprs=[["F/2"],["0"]],pin=[],pout=[],pein=[],peout=16,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sampleclk",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[[1/2],[0]],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[16-1] = scicos_link(xx=[[48.313686],[48.229901]],yy=[[403.57431],[385.21998]],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[1,1,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [];
-        model.in2 = [];
-        model.intyp = 1;
-        model.out = -1;
-        model.out2 = -2;
-        model.outtyp = -1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.odstate = list();
-        model.rpar = scs_m_1;
-        model.ipar = 1;
-        model.opar = list();
-        model.blocktype = "h";
-        model.firing = [];
-        model.dep_ut = [false,false];
-        model.label = "";
-        model.nzcross = 0;
-        model.nmode = 0;
-        model.equations = list();
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [];
+        this.model.in2 = [];
+        this.model.intyp = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(-1);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.outtyp = new ScilabDouble(-1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.odstate = list();
+        this.model.rpar = new ScilabDouble(scs_m_1);
+        this.model.ipar = new ScilabDouble(1);
+        this.model.opar = list();
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = [];
+        this.model.dep_ut = [false,false];
+        this.model.label = new ScilabString("");
+        this.model.nzcross = new ScilabDouble(0);
+        this.model.nmode = new ScilabDouble(0);
+        this.model.equations = list();
         Amin = -1;
         Amax = 1;
         rule = 1;
         F = 1;
         exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     GEN_SQR.prototype.details = function GEN_SQR() {
diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle
index fe10ccba..6d4c3f8b 100644
--- a/js/Sources/GEN_SQR.pickle
+++ b/js/Sources/GEN_SQR.pickle
@@ -14,8 +14,10 @@ aS'scicos_context.Amin'
 p6
 aS'scicos_context.F'
 p7
-atp8
-Rp9
+aS'model'
+p8
+atp9
+Rp10
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index 686c27a7..37887703 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -2,20 +2,20 @@
 function Ground_g() {
     Ground_g.prototype.define = function Ground_g() {
         C = [0];
-        model = scicos_model();
-        model.sim = list("cstblk4_m",4);
-        model.in1 = [];
-        model.out = 1;
-        model.in2 = [];
-        model.out2 = 1;
-        model.outtyp = -1;
-        model.rpar = [];
-        model.opar = list(C);
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("cstblk4_m",4);
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.in2 = [];
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(-1);
+        this.model.rpar = [];
+        this.model.opar = list(C);
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = [];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     Ground_g.prototype.details = function Ground_g() {
diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle
index eea3cae8..8d528a45 100644
--- a/js/Sources/Ground_g.pickle
+++ b/js/Sources/Ground_g.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index 9df4edbe..10b32d3a 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -1,21 +1,21 @@
 /* autogenerated from "macros/Sources/INIMPL_f.sci" */
 function INIMPL_f() {
     INIMPL_f.prototype.define = function INIMPL_f() {
-        model = scicos_model();
-        model.sim = "inimpl";
-        model.out = [-1];
-        model.out2 = [1];
-        model.ipar = [1];
-        model.dep_ut = [false,false];
-        model.blocktype = "c";
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("inimpl");
+        this.model.out = [-1];
+        this.model.out2 = [1];
+        this.model.ipar = [1];
+        this.model.dep_ut = [false,false];
+        this.model.blocktype = new ScilabString("c");
         mo = modelica();
         mo.model = "PORT";
         mo.outputs = "n";
-        model.equations = mo;
+        this.model.equations = new ScilabDouble(mo);
         this.prt = 1;
         exprs = "1";
         gr_i = [];
-        this.x = standard_define([1,1],model,exprs,gr_i);
+        this.x = standard_define([1,1],this.model,exprs,gr_i);
         this.x.graphics.out_implicit = ["I"];
         return new ImplicitInBlock(this.x);
     }
@@ -32,7 +32,7 @@ function INIMPL_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")==2) {
             exprs = exprs[1-1];
         }
@@ -45,14 +45,14 @@ function INIMPL_f() {
             if (this.prt<=0) {
                 block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected.");
             } else {
-                if (model.ipar!=this.prt) {
+                if (this.model.ipar!=this.prt) {
                     needcompile = 4;
                     y = needcompile;
                 }
-                model.ipar = this.prt;
+                this.model.ipar = new ScilabDouble(this.prt);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle
index 5b3558e6..a715bfa6 100644
--- a/js/Sources/INIMPL_f.pickle
+++ b/js/Sources/INIMPL_f.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'prt'
+aS'model'
 p3
-atp4
-Rp5
+aS'prt'
+p4
+atp5
+Rp6
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index 35abf0bb..d3a1e578 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -2,17 +2,17 @@
 function IN_f() {
     IN_f.prototype.define = function IN_f() {
         prt = 1;
-        model = scicos_model();
-        model.sim = "input";
-        model.out = -1;
-        model.out2 = -2;
-        model.outtyp = -1;
-        model.ipar = prt;
-        model.blocktype = "c";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("input");
+        this.model.out = new ScilabDouble(-1);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.outtyp = new ScilabDouble(-1);
+        this.model.ipar = new ScilabDouble(prt);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,false];
         exprs = sci2exp(prt);
         gr_i = [];
-        this.x = standard_define([1,1],model,exprs,gr_i);
+        this.x = standard_define([1,1],this.model,exprs,gr_i);
         return new ExplicitInBlock(this.x);
     }
     IN_f.prototype.details = function IN_f() {
@@ -26,7 +26,7 @@ function IN_f() {
     IN_f.prototype.set = function IN_f() {
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         if (size(exprs,"*")==2) {
             exprs = exprs[1-1];
@@ -47,18 +47,18 @@ function IN_f() {
             } else if (((ot<1||ot>9)&&(ot!=-1))) {
                 message(_("Outport type must be a number between 1 and 9, or -1 for inheritance."));
             } else {
-                if (model.ipar!=prt) {
+                if (this.model.ipar!=prt) {
                     needcompile = 4;
                     y = needcompile;
                 }
-                model.ipar = prt;
-                model.firing = [];
-                model.out = otsz[1-1];
-                model.out2 = otsz[2-1];
-                model.outtyp = ot;
+                this.model.ipar = new ScilabDouble(prt);
+                this.model.firing = [];
+                this.model.out = new ScilabDouble(otsz[1-1]);
+                this.model.out2 = new ScilabDouble(otsz[2-1]);
+                this.model.outtyp = new ScilabDouble(ot);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle
index 9027cd73..4bfdc5a8 100644
--- a/js/Sources/IN_f.pickle
+++ b/js/Sources/IN_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index d65b6931..fa1eb183 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -3,17 +3,17 @@ function Modulo_Count() {
     Modulo_Count.prototype.define = function Modulo_Count() {
         this.ini_c = 0;
         this.base = 3;
-        model = scicos_model();
-        model.sim = list("modulo_count",4);
-        model.evtin = 1;
-        model.out = 1;
-        model.dstate = this.ini_c;
-        model.ipar = this.base;
-        model.blocktype = "c";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("modulo_count",4);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(this.ini_c);
+        this.model.ipar = new ScilabDouble(this.base);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,false];
         exprs = [[string(this.ini_c)],[string(this.base)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     Modulo_Count.prototype.details = function Modulo_Count() {
@@ -32,7 +32,7 @@ function Modulo_Count() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.ini_c,this.base,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),exprs);
             this.ini_c = int(this.ini_c);
@@ -46,10 +46,10 @@ function Modulo_Count() {
                 block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected.");
             } else {
                 graphics.exprs = exprs;
-                model.ipar = this.base;
-                model.dstate = this.ini_c;
+                this.model.ipar = new ScilabDouble(this.base);
+                this.model.dstate = new ScilabDouble(this.ini_c);
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle
index 11d19748..d2532ce2 100644
--- a/js/Sources/Modulo_Count.pickle
+++ b/js/Sources/Modulo_Count.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'base'
+aS'model'
 p3
-aS'ini_c'
+aS'base'
 p4
-atp5
-Rp6
+aS'ini_c'
+p5
+atp6
+Rp7
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index 496a0a2d..3823707f 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -13,36 +13,36 @@ function PULSE_SC() {
         scs_m_1.objs[9-1] = scicos_link(xx=[[112.34974],[112.34974],[119.33985],[119.33985]],yy=[[274.21741],[248.21372],[248.21372],[231.80809]],id="drawlink",thick=[0,0],ct=[5,-1],from=[6,1,0],to=[3,1,1]);
         scs_m_1.objs[10-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[174.57795,196.09381],sz=[20,20],flip=true,theta=0,exprs="1",pin=11,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[11-1] = scicos_link(xx=[[154.57795],[174.57795]],yy=[[206.09381],[206.09381]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]);
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = [];
-        model.in2 = [];
-        model.intyp = 1;
-        model.out = -1;
-        model.out2 = -2;
-        model.outtyp = -1;
-        model.evtin = [];
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [];
-        model.odstate = list();
-        model.rpar = scs_m_1;
-        model.ipar = 1;
-        model.opar = list();
-        model.blocktype = "h";
-        model.firing = [];
-        model.dep_ut = [false,false];
-        model.label = "";
-        model.nzcross = 0;
-        model.nmode = 0;
-        model.equations = list();
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = [];
+        this.model.in2 = [];
+        this.model.intyp = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(-1);
+        this.model.out2 = new ScilabDouble(-2);
+        this.model.outtyp = new ScilabDouble(-1);
+        this.model.evtin = [];
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [];
+        this.model.odstate = list();
+        this.model.rpar = new ScilabDouble(scs_m_1);
+        this.model.ipar = new ScilabDouble(1);
+        this.model.opar = list();
+        this.model.blocktype = new ScilabString("h");
+        this.model.firing = [];
+        this.model.dep_ut = [false,false];
+        this.model.label = new ScilabString("");
+        this.model.nzcross = new ScilabDouble(0);
+        this.model.nmode = new ScilabDouble(0);
+        this.model.equations = list();
         E = 0.1;
         W = 30;
         F = 1;
         A = 1;
         exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     PULSE_SC.prototype.details = function PULSE_SC() {
diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle
index cc8d499f..c2906a0a 100644
--- a/js/Sources/PULSE_SC.pickle
+++ b/js/Sources/PULSE_SC.pickle
@@ -8,14 +8,16 @@ aS'scicos_context.W'
 p3
 aS'x'
 p4
-aS'scicos_context.A'
+aS'model'
 p5
-aS'scicos_context.F'
+aS'scicos_context.A'
 p6
-aS'scicos_context.E'
+aS'scicos_context.F'
 p7
-atp8
-Rp9
+aS'scicos_context.E'
+p8
+atp9
+Rp10
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index f34a816a..e3ad460e 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -5,18 +5,18 @@ function RAMP() {
         this.iout = 0;
         this.stt = 0;
         rpar = [[this.slope],[this.stt],[this.iout]];
-        model = scicos_model();
-        model.sim = list("ramp",4);
-        model.in1 = [];
-        model.out = 1;
-        model.rpar = rpar;
-        model.blocktype = "c";
-        model.nmode = 1;
-        model.nzcross = 1;
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = list("ramp",4);
+        this.model.in1 = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.rpar = rpar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.nmode = new ScilabDouble(1);
+        this.model.nzcross = new ScilabDouble(1);
+        this.model.dep_ut = [false,true];
         exprs = [string(rpar)];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     RAMP.prototype.details = function RAMP() {
@@ -37,7 +37,7 @@ function RAMP() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -46,10 +46,10 @@ function RAMP() {
             if (this.stt<0) {
                 block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected.");
             } else {
-                model.rpar = [[this.slope],[this.stt],[this.iout]];
+                this.model.rpar = [[this.slope],[this.stt],[this.iout]];
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle
index b4c9f675..5efd46d0 100644
--- a/js/Sources/RAMP.pickle
+++ b/js/Sources/RAMP.pickle
@@ -6,12 +6,14 @@ S'slope'
 p2
 aS'x'
 p3
-aS'stt'
+aS'model'
 p4
 aS'iout'
 p5
-atp6
-Rp7
+aS'stt'
+p6
+atp7
+Rp8
 .(dp0
 S'slope'
 p1
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index fb90a1e8..af0850f7 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -6,18 +6,18 @@ function RAND_f() {
         dt = 0;
         out = 1;
         this.flag = 0;
-        model = scicos_model();
-        model.sim = "rndblk";
-        model.out = out;
-        model.evtin = 1;
-        model.dstate = [[int(rand()*(10^7-1))],[0*this.a.slice()]];
-        model.rpar = [[this.a.slice()],[this.b.slice()]];
-        model.ipar = this.flag;
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
-        exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(model.dstate[1-1])]];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("rndblk");
+        this.model.out = new ScilabDouble(out);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = [[int(rand()*(10^7-1))],[0*this.a.slice()]];
+        this.model.rpar = [[this.a.slice()],[this.b.slice()]];
+        this.model.ipar = new ScilabDouble(this.flag);
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
+        exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     RAND_f.prototype.details = function RAND_f() {
@@ -40,12 +40,12 @@ function RAND_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")==5) {
             exprs = exprs.slice(1-1,3);
         }
         if (size(exprs,"*")==3) {
-            exprs = [[exprs],[string(model.dstate[1-1])]];
+            exprs = [[exprs],[string(this.model.dstate[1-1])]];
         }
         while (true) {
             [ok,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs);
@@ -57,12 +57,12 @@ function RAND_f() {
             } else {
                 nout = size(this.a,"*");
                 graphics.exprs = exprs;
-                model.out = nout;
-                model.ipar = this.flag;
-                model.rpar = [[this.a.slice()],[this.b.slice()]];
-                model.dstate = [[this.seed_c],[0*this.a.slice()]];
+                this.model.out = new ScilabDouble(nout);
+                this.model.ipar = new ScilabDouble(this.flag);
+                this.model.rpar = [[this.a.slice()],[this.b.slice()]];
+                this.model.dstate = [[this.seed_c],[0*this.a.slice()]];
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle
index 7adc7fdb..984969db 100644
--- a/js/Sources/RAND_f.pickle
+++ b/js/Sources/RAND_f.pickle
@@ -4,16 +4,18 @@ p0
 ((lp1
 S'a'
 p2
-aS'x'
+aS'b'
 p3
-aS'flag'
+aS'seed_c'
 p4
-aS'b'
+aS'flag'
 p5
-aS'seed_c'
+aS'x'
 p6
-atp7
-Rp8
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index f602ae68..d8fc327c 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -7,26 +7,26 @@ function RAND_m() {
         this.flag = 0;
         function_name = "rndblk_m";
         funtyp = 4;
-        model = scicos_model();
-        model.sim = list(function_name,funtyp);
-        model.in1 = [];
-        model.in2 = [];
-        model.intyp = [];
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.evtin = 1;
-        model.evtout = [];
-        model.state = [];
-        model.dstate = [[int(rand()*(10^7-1))],[0*this.a.slice()]];
-        model.rpar = [this.a.slice(),this.b.slice()];
-        model.ipar = this.flag;
-        model.blocktype = "d";
-        model.firing = [];
-        model.dep_ut = [false,false];
-        exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([model.dstate[1-1],int(rand()*(10^7-1))])]];
+        this.model = scicos_model();
+        this.model.sim = list(function_name,funtyp);
+        this.model.in1 = [];
+        this.model.in2 = [];
+        this.model.intyp = [];
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.evtout = [];
+        this.model.state = [];
+        this.model.dstate = [[int(rand()*(10^7-1))],[0*this.a.slice()]];
+        this.model.rpar = [this.a.slice(),this.b.slice()];
+        this.model.ipar = new ScilabDouble(this.flag);
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = [];
+        this.model.dep_ut = [false,false];
+        exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     RAND_m.prototype.details = function RAND_m() {
@@ -51,7 +51,7 @@ function RAND_m() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         if (size(exprs,"*")==14) {
             exprs[9-1] = [];
         }
@@ -66,26 +66,26 @@ function RAND_m() {
                 out = size(this.a);
                 if (this.typ==1) {
                     function_name = "rndblk_m";
-                    model.rpar = [[real(this.a.slice())],[real(this.b.slice())]];
-                    model.dstate = [[this.seed_c[1-1]],[0*real(this.a.slice())]];
+                    this.model.rpar = [[real(this.a.slice())],[real(this.b.slice())]];
+                    this.model.dstate = [[this.seed_c[1-1]],[0*real(this.a.slice())]];
                     ot = 1;
                 } else if (this.typ==2) {
                     function_name = "rndblkz_m";
                     ot = 2;
-                    model.rpar = [[real(this.a.slice())],[imag(this.a.slice())],[real(this.b.slice())],[imag(this.b.slice())]];
-                    model.dstate = [[this.seed_c.slice()],[0*[[real(this.a.slice())],[imag(this.a.slice())]]]];
+                    this.model.rpar = [[real(this.a.slice())],[imag(this.a.slice())],[real(this.b.slice())],[imag(this.b.slice())]];
+                    this.model.dstate = [[this.seed_c.slice()],[0*[[real(this.a.slice())],[imag(this.a.slice())]]]];
                 } else {
                     message("Datatype is not supported");
                     ok = false;
                 }
                 if (ok) {
-                    [model,graphics,ok] = set_io(model,graphics,list([],[]),list(out,ot),1,[]);
+                    [model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]);
                     if (ok) {
-                        model.sim = list(function_name,4);
+                        this.model.sim = list(function_name,4);
                         graphics.exprs = exprs;
-                        model.ipar = this.flag;
+                        this.model.ipar = new ScilabDouble(this.flag);
                         this.x.graphics = graphics;
-                        this.x.model = model;
+                        this.x.model = this.model;
                         break;
                     }
                 }
diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle
index 99914cfd..0edfeeda 100644
--- a/js/Sources/RAND_m.pickle
+++ b/js/Sources/RAND_m.pickle
@@ -12,10 +12,12 @@ aS'flag'
 p5
 aS'x'
 p6
-aS'typ'
+aS'model'
 p7
-atp8
-Rp9
+aS'typ'
+p8
+atp9
+Rp10
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index e808579b..9a3996f2 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -12,17 +12,17 @@ function READAU_f() {
         outmask = 1;
         ievt = 0;
         nout = size(outmask,"*");
-        model = scicos_model();
-        model.sim = list("readau",2);
-        model.out = nout;
-        model.evtin = 1;
-        model.dstate = [[1],[1],[lunit],[zeros(this.N*M,1)]];
-        model.ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]];
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("readau",2);
+        this.model.out = new ScilabDouble(nout);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = [[1],[1],[lunit],[zeros(this.N*M,1)]];
+        this.model.ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = [[fname],[string(this.N)],[string(this.swap)]];
         gr_i = [];
-        this.x = standard_define([5,2],model,exprs,gr_i);
+        this.x = standard_define([5,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     READAU_f.prototype.details = function READAU_f() {
@@ -43,10 +43,10 @@ function READAU_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        out = model.out;
-        dstate = model.dstate;
-        ipar = model.ipar;
+        this.model = arg1.model;
+        out = this.model.out;
+        dstate = this.model.dstate;
+        ipar = this.model.ipar;
         imask = 9+ipar[1-1];
         tmask = ipar[imask-1];
         lunit = dstate[3-1];
@@ -74,18 +74,18 @@ function READAU_f() {
             } else if (this.swap!=0&&this.swap!=1) {
                 block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]"));
             } else {
-                [model,graphics,ok] = check_io(model,graphics,[],1,1,[]);
+                [model,graphics,ok] = check_io(this.model,graphics,[],1,1,[]);
                 frmt1 = part(frmt1,1,3);
                 if (ok) {
                     ipar = [[length(this.fname1)],[this._str2code[frmt1-1]],[0],[this.N],[M],[this.swap],[offset,this._str2code[this.fname1-1]],[tmask1,outmask.slice()]];
                     if (prod(size(dstate))!=(this.N*M)+3) {
                         dstate = [[-1],[-1],[lunit],[zeros(this.N*M,1)]];
                     }
-                    model.dstate = dstate;
-                    model.ipar = ipar;
+                    this.model.dstate = dstate;
+                    this.model.ipar = ipar;
                     graphics.exprs = exprs;
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle
index 645d82bd..a9f6a4a0 100644
--- a/js/Sources/READAU_f.pickle
+++ b/js/Sources/READAU_f.pickle
@@ -12,10 +12,12 @@ aS'alreadyran'
 p5
 aS'x'
 p6
-aS'swap'
+aS'model'
 p7
-atp8
-Rp9
+aS'swap'
+p8
+atp9
+Rp10
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index e6f44c28..5084d60e 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -14,19 +14,19 @@ function READC_f() {
         ievt = 0;
         nout = size(this.outmask,"*");
         ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]];
-        model = scicos_model();
-        model.sim = list("readc",2);
-        model.out = nout;
-        model.evtin = 1;
-        model.evtout = [];
-        model.dstate = [[1],[1],[lunit],[zeros(this.N*this.M,1)]];
-        model.ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]];
-        model.blocktype = "d";
-        model.firing = -1;
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("readc",2);
+        this.model.out = new ScilabDouble(nout);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.evtout = [];
+        this.model.dstate = [[1],[1],[lunit],[zeros(this.N*this.M,1)]];
+        this.model.ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = new ScilabDouble(-1);
+        this.model.dep_ut = [false,false];
         exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]];
         gr_i = [];
-        this.x = standard_define([4,2],model,exprs,gr_i);
+        this.x = standard_define([4,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     READC_f.prototype.details = function READC_f() {
@@ -55,12 +55,12 @@ function READC_f() {
         this.offset = parseFloat(arguments[0]["offset"])
         this.swap = parseFloat(arguments[0]["swap"])
         this.x = arg1;
-        model = this.x.model;
+        this.model = this.x.model;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        out = model.out;
-        dstate = model.dstate;
-        ipar = model.ipar;
+        out = this.model.out;
+        dstate = this.model.dstate;
+        ipar = this.model.ipar;
         imask = 9+ipar[1-1];
         tmask = ipar[imask-1];
         lunit = dstate[3-1];
@@ -113,23 +113,23 @@ function READC_f() {
                     outpt = 1;
                 }
                 out = size(this.outmask,"*");
-                [model,graphics,ok] = check_io(model,graphics,[],out,1,outpt);
+                [model,graphics,ok] = check_io(this.model,graphics,[],out,1,outpt);
                 this.frmt1 = part(this.frmt1,1,3);
                 if (ok) {
                     if (ievt==0) {
-                        model.firing = -1;
+                        this.model.firing = new ScilabDouble(-1);
                     } else {
-                        model.firing = 0;
+                        this.model.firing = new ScilabDouble(0);
                     }
                     ipar = [[length(this.fname1)],[this._str2code[this.frmt1-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[this.fname1-1]],[this.tmask1],[this.outmask.slice()]];
                     if (prod(size(dstate))!=(this.N*this.M)+3) {
                         dstate = [[-1],[-1],[lunit],[zeros(this.N*this.M,1)]];
                     }
-                    model.dstate = dstate;
-                    model.ipar = ipar;
+                    this.model.dstate = dstate;
+                    this.model.ipar = ipar;
                     graphics.exprs = exprs;
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle
index 0332b448..784bffe7 100644
--- a/js/Sources/READC_f.pickle
+++ b/js/Sources/READC_f.pickle
@@ -20,12 +20,14 @@ aS'offset'
 p9
 aS'x'
 p10
-aS'tmask1'
+aS'model'
 p11
-aS'alreadyran'
+aS'tmask1'
 p12
-atp13
-Rp14
+aS'alreadyran'
+p13
+atp14
+Rp15
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js
index 419f0bb1..18a469ac 100644
--- a/js/Sources/RFILE_f.js
+++ b/js/Sources/RFILE_f.js
@@ -12,17 +12,17 @@ function RFILE_f() {
         this.outmask = 1;
         ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]];
         dstate = [[1],[1],[lunit],[zeros((nout)*this.N,1)]];
-        model = scicos_model();
-        model.sim = "readf";
-        model.out = nout;
-        model.evtin = 1;
-        model.dstate = dstate;
-        model.ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]];
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("readf");
+        this.model.out = new ScilabDouble(nout);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = dstate;
+        this.model.ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     RFILE_f.prototype.details = function RFILE_f() {
@@ -47,9 +47,9 @@ function RFILE_f() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
-        dstate = model.dstate;
-        ipar = model.ipar;
+        this.model = arg1.model;
+        dstate = this.model.dstate;
+        ipar = this.model.ipar;
         ievt = ipar[3-1];
         this.N = ipar[4-1];
         imask = 5+ipar[1-1]+ipar[2-1];
@@ -97,22 +97,22 @@ function RFILE_f() {
                     ievt = 1;
                     cout = 1;
                 }
-                [model,graphics,ok] = check_io(model,graphics,[],nout,1,cout);
+                [model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout);
                 if (ok) {
                     if (ievt==0) {
-                        model.firing = [];
+                        this.model.firing = [];
                     } else {
-                        model.firing = 0;
+                        this.model.firing = new ScilabDouble(0);
                     }
                     ipar = [[length(this.fname1)],[length(this.frmt1)],[ievt],[this.N],[this._str2code[this.fname1-1]],[this._str2code[this.frmt1-1]],[this.tmask1],[this.outmask.slice()]];
                     if (prod(size(dstate))!=(nout+ievt)*this.N+3) {
                         dstate = [[-1],[-1],[lunit],[zeros((nout+ievt)*this.N,1)]];
                     }
-                    model.dstate = dstate;
-                    model.ipar = ipar;
+                    this.model.dstate = dstate;
+                    this.model.ipar = ipar;
                     graphics.exprs = exprs;
                     this.x.graphics = graphics;
-                    this.x.model = model;
+                    this.x.model = this.model;
                     break;
                 }
             }
diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle
index 27183e5c..81197c15 100644
--- a/js/Sources/RFILE_f.pickle
+++ b/js/Sources/RFILE_f.pickle
@@ -14,10 +14,12 @@ aS'N'
 p6
 aS'x'
 p7
-aS'tmask1'
+aS'model'
 p8
-atp9
-Rp10
+aS'tmask1'
+p9
+atp10
+Rp11
 .(dp0
 S'tmask'
 p1
diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js
index 5650778d..40a2aaa4 100644
--- a/js/Sources/SAWTOOTH_f.js
+++ b/js/Sources/SAWTOOTH_f.js
@@ -1,16 +1,16 @@
 /* autogenerated from "macros/Sources/SAWTOOTH_f.sci" */
 function SAWTOOTH_f() {
     SAWTOOTH_f.prototype.define = function SAWTOOTH_f() {
-        model = scicos_model();
-        model.sim = "sawtth";
-        model.out = 1;
-        model.evtin = 1;
-        model.dstate = 0;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("sawtth");
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         exprs = " ";
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     SAWTOOTH_f.prototype.details = function SAWTOOTH_f() {
diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle
index 9bc296b1..40c4ca73 100644
--- a/js/Sources/SAWTOOTH_f.pickle
+++ b/js/Sources/SAWTOOTH_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 1d5fbe8a..af7fb2cc 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -2,20 +2,20 @@
 function STEP() {
     STEP.prototype.define = function STEP() {
         rpar = [[0],[1]];
-        model = scicos_model();
-        model.sim = list("step_func",4);
-        model.evtin = 1;
-        model.evtout = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.firing = 1;
-        model.rpar = rpar;
-        model.blocktype = "c";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("step_func",4);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.evtout = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.firing = new ScilabDouble(1);
+        this.model.rpar = rpar;
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,false];
         exprs = [[string(1)],[string(rpar)]];
         gr_i = [];
-        this.x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     STEP.prototype.details = function STEP() {
@@ -36,7 +36,7 @@ function STEP() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         while (true) {
             [ok,this.temps,this.in1,this.fi,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),exprs);
             if (!ok) {
@@ -55,21 +55,21 @@ function STEP() {
                 }
             }
             if (ok) {
-                model.out2 = 1;
-                model.outtyp = 1;
-                [model,graphics,ok] = check_io(model,graphics,[],size(this.fi,"*"),1,1);
+                this.model.out2 = new ScilabDouble(1);
+                this.model.outtyp = new ScilabDouble(1);
+                [model,graphics,ok] = check_io(this.model,graphics,[],size(this.fi,"*"),1,1);
             }
             if (ok) {
-                model.firing = this.temps;
+                this.model.firing = new ScilabDouble(this.temps);
                 if (this.temps==0) {
                     rpar = [[this.fi],[this.fi]];
                 } else {
                     rpar = [[this.in1],[this.fi]];
                 }
-                model.rpar = rpar;
+                this.model.rpar = rpar;
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle
index 026264fc..61507c43 100644
--- a/js/Sources/STEP.pickle
+++ b/js/Sources/STEP.pickle
@@ -6,12 +6,14 @@ S'temps'
 p2
 aS'x'
 p3
-aS'in1'
+aS'model'
 p4
-aS'fi'
+aS'in1'
 p5
-atp6
-Rp7
+aS'fi'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index bc6c83da..696ea445 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -8,25 +8,25 @@ function STEP_FUNCTION() {
         scs_m_1.objs[4-1] = scicos_link();
         blk = scs_m_1.objs[1-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [0,0];
         graphics.sz = [40,40];
         graphics.pein = 4;
         graphics.peout = 4;
         graphics.pout = 3;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[1-1] = blk;
         blk = scs_m_1.objs[2-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [80,10];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pin = 3;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[2-1] = blk;
         lnk = scs_m_1.objs[3-1];
         lnk.from = [1,1,0];
@@ -41,14 +41,14 @@ function STEP_FUNCTION() {
         scs_m_1.objs[4-1] = lnk;
         blk={};
         lnk={};
-        model = scicos_model();
-        model.sim = "csuper";
-        model.out = 1;
-        model.out2 = 1;
-        model.outtyp = 1;
-        model.rpar = scs_m_1;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.outtyp = new ScilabDouble(1);
+        this.model.rpar = scs_m_1;
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     STEP_FUNCTION.prototype.details = function STEP_FUNCTION() {
@@ -80,37 +80,37 @@ function STEP_FUNCTION() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) {
+                    modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label);
+                    if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) {
                         needcompile = 1;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;
diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle
index fb7b5d49..16eeb41f 100644
--- a/js/Sources/STEP_FUNCTION.pickle
+++ b/js/Sources/STEP_FUNCTION.pickle
@@ -4,10 +4,12 @@ p0
 ((lp1
 S'x'
 p2
-aS'xxn'
+aS'model'
 p3
-atp4
-Rp5
+aS'xxn'
+p4
+atp5
+Rp6
 .(dp0
 S'lnk.ct'
 p1
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index a91881eb..34505fc0 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -1,15 +1,15 @@
 /* autogenerated from "macros/Sources/SampleCLK.sci" */
 function SampleCLK() {
     SampleCLK.prototype.define = function SampleCLK() {
-        model = scicos_model();
-        model.sim = "sampleclk";
-        model.evtout = 1;
-        model.rpar = [1,0];
-        model.blocktype = "d";
-        model.firing = -1;
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("sampleclk");
+        this.model.evtout = new ScilabDouble(1);
+        this.model.rpar = [1,0];
+        this.model.blocktype = new ScilabString("d");
+        this.model.firing = new ScilabDouble(-1);
+        this.model.dep_ut = [false,false];
         exprs = [[sci2exp(1)],[sci2exp(0)]];
-        this.x = standard_define([2,2],model,exprs," ");
+        this.x = standard_define([2,2],this.model,exprs," ");
         return new BasicBlock(this.x);
     }
     SampleCLK.prototype.details = function SampleCLK() {
@@ -27,7 +27,7 @@ function SampleCLK() {
         this.offset = arguments[0]["offset"]
         this.x = arg1;
         graphics = arg1.graphics;
-        model = arg1.model;
+        this.model = arg1.model;
         exprs = graphics.exprs;
         while (true) {
             [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs);
@@ -43,16 +43,16 @@ function SampleCLK() {
                 ok = false;
             }
             if (ok) {
-                if (or(model.rpar.slice()!=[[this.frequ],[this.offset]])) {
+                if (or(this.model.rpar.slice()!=[[this.frequ],[this.offset]])) {
                     needcompile = 4;
                     y = needcompile;
                 }
-                model.rpar = [[this.frequ],[this.offset]];
-                model.evtout = 1;
-                model.firing = -1;
+                this.model.rpar = [[this.frequ],[this.offset]];
+                this.model.evtout = new ScilabDouble(1);
+                this.model.firing = new ScilabDouble(-1);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }
diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle
index 19edde44..4cf41094 100644
--- a/js/Sources/SampleCLK.pickle
+++ b/js/Sources/SampleCLK.pickle
@@ -4,12 +4,14 @@ p0
 ((lp1
 S'x'
 p2
-aS'frequ'
+aS'model'
 p3
-aS'offset'
+aS'frequ'
 p4
-atp5
-Rp6
+aS'offset'
+p5
+atp6
+Rp7
 .(dp0
 S'needcompile'
 p1
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 89064608..8dcd8461 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -10,9 +10,9 @@ function Sigbuilder() {
         scs_m_1.objs[6-1] = scicos_link(xx=[[378.20616],[398.20616]],yy=[[626.18517],[626.18517]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]);
         scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
         scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]);
-        model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
+        this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list());
         gr_i = [];
-        this.x = standard_define([3,2],model,[],gr_i);
+        this.x = standard_define([3,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     Sigbuilder.prototype.details = function Sigbuilder() {
@@ -46,40 +46,40 @@ function Sigbuilder() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+                    modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label);
+                    if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) {
                         needcompile = 1;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+                    if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) {
                         needcompile = 4;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;
diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle
index f013555d..2c79062e 100644
--- a/js/Sources/Sigbuilder.pickle
+++ b/js/Sources/Sigbuilder.pickle
@@ -8,14 +8,16 @@ aS'y'
 p3
 aS'x'
 p4
-aS'N'
+aS'model'
 p5
-aS'ORDER2'
+aS'N'
 p6
-aS'order'
+aS'ORDER2'
 p7
-atp8
-Rp9
+aS'order'
+p8
+atp9
+Rp10
 .(dp0
 S'Y[j-1]'
 p1
diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js
index e0476b40..4fbd512e 100644
--- a/js/Sources/TIME_f.js
+++ b/js/Sources/TIME_f.js
@@ -1,13 +1,13 @@
 /* autogenerated from "macros/Sources/TIME_f.sci" */
 function TIME_f() {
     TIME_f.prototype.define = function TIME_f() {
-        model = scicos_model();
-        model.sim = "timblk";
-        model.out = 1;
-        model.blocktype = "c";
-        model.dep_ut = [false,true];
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("timblk");
+        this.model.out = new ScilabDouble(1);
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,true];
         gr_i = [];
-        this.x = standard_define([2,2],model,[],gr_i);
+        this.x = standard_define([2,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     TIME_f.prototype.details = function TIME_f() {
diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle
index 50df16d2..8cc9b048 100644
--- a/js/Sources/TIME_f.pickle
+++ b/js/Sources/TIME_f.pickle
@@ -4,8 +4,10 @@ p0
 ((lp1
 S'x'
 p2
-atp3
-Rp4
+aS'model'
+p3
+atp4
+Rp5
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index c29ec00e..4f31582a 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -4,16 +4,16 @@ function TKSCALE() {
         this.a = -10;
         this.b = 10;
         this.f = 1;
-        model = scicos_model();
-        model.sim = list("tkscaleblk",5);
-        model.out = 1;
-        model.evtin = 1;
-        model.rpar = [[this.a],[this.b],[this.f]];
-        model.blocktype = "d";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("tkscaleblk",5);
+        this.model.out = new ScilabDouble(1);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.rpar = [[this.a],[this.b],[this.f]];
+        this.model.blocktype = new ScilabString("d");
+        this.model.dep_ut = [false,false];
         exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     TKSCALE.prototype.details = function TKSCALE() {
@@ -34,13 +34,13 @@ function TKSCALE() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        this.model = arg1.model;
         [ok,this.a,this.b,this.f,exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs);
         if (ok) {
             graphics.exprs = exprs;
-            model.rpar = [[this.a],[this.b],[this.f]];
+            this.model.rpar = [[this.a],[this.b],[this.f]];
             this.x.graphics = graphics;
-            this.x.model = model;
+            this.x.model = this.model;
         }
         return new BasicBlock(this.x);
     }
diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle
index d4dc27cf..6e70cea7 100644
--- a/js/Sources/TKSCALE.pickle
+++ b/js/Sources/TKSCALE.pickle
@@ -6,12 +6,14 @@ S'a'
 p2
 aS'x'
 p3
-aS'b'
+aS'model'
 p4
-aS'f'
+aS'b'
 p5
-atp6
-Rp7
+aS'f'
+p6
+atp7
+Rp8
 .(dp0
 S'a'
 p1