Merge pull request #54 from grenadier-amit/master

Fix edge case of list and scilab integer

228 files changed, 822 insertions, 593 deletions

diff --git a/data_structures/ABS_VALUE.js b/data_structures/ABS_VALUE.js
index 65c6df1..ef569e9 100644
--- a/data_structures/ABS_VALUE.js
+++ b/data_structures/ABS_VALUE.js
@@ -4,16 +4,17 @@ function ABS_VALUE () {
 	var nu = -1;
 
 	var model = scicos_model();
-	model.sim=list("absolute_value",4);
-	model.in=new ScilabDouble([nu]);
+	model.sim=list(new ScilabString(["absolute_value"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([nu]));
 	model.out=new ScilabDouble([nu]);
 	model.nzcross=new ScilabDouble([nu]);
 	model.nmode=new ScilabDouble([nu]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[1].toString()];
+	var exprs = [string([1])];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/AFFICH_m.js b/data_structures/AFFICH_m.js
index ae338a8..ff0b180 100644
--- a/data_structures/AFFICH_m.js
+++ b/data_structures/AFFICH_m.js
@@ -11,21 +11,23 @@ function AFFICH_m () {
 
 	var nd = 1;
 
-	var in = [1,1];
+	var in1 = [1,1];
 
 	var model = scicos_model();
-	model.sim=list("affich2",4);
-	model.in=in(1,1);
-	model.in2.push(in(1,2));
+	model.sim=list(new ScilabString(["affich2"]),new ScilabDouble([4]));
+	model.in1.push(in1(1,1));
+	model.in2.push(in1(1,2));
 	model.evtin = new ScilabDouble([1]);
-	model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(in(1,1)*in(1,2),1)]);
-	model.ipar = new ScilabDouble([font],[fontsize],[colr],[1000],[nt],[nd],[in(1,1)]);
+	model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(in1(1,1)*in1(1,2),1)]);
+	model.ipar = new ScilabDouble([font],[fontsize],[colr],[1000],[nt],[nd],[in1(1,1)]);
 	model.blocktype = new ScilabString(["c"]);
-	model.firing = new ScilabDouble(, , ,],[model.dep_ut,=,[%t,%f]);
+	model.firing = new ScilabDouble();
+	model.dep_ut = new ScilabBoolean([true,false]);
 	model.label = new ScilabString([""]);
 
-	var exprs = [[,sci2exp([model.in,model.in2])],[font.toString()],[fontsize.toString()],[colr.toString()],[nt.toString()],[nd.toString()],[0.toString(),]];
+	var exprs = [[,sci2exp([model.in1,model.in2])],[string(font)],[string(fontsize)],[string(colr)],[string(nt)],[string(nd)],[string(0),]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new AfficheBlock(this.x)
 }
diff --git a/data_structures/ANDBLK.js b/data_structures/ANDBLK.js
index 335a286..6d88e54 100644
--- a/data_structures/ANDBLK.js
+++ b/data_structures/ANDBLK.js
@@ -71,4 +71,5 @@ function ANDBLK () {
 	this.x.model.firing = new ScilabBoolean([false]);
 	this.x.model.dep_ut = new ScilabBoolean([false,false]);
 	this.x.model.rpar=diagram;
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ANDLOG_f.js b/data_structures/ANDLOG_f.js
index ea8f55d..b94c240 100644
--- a/data_structures/ANDLOG_f.js
+++ b/data_structures/ANDLOG_f.js
@@ -11,4 +11,5 @@ function ANDLOG_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,3]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/AUTOMAT.js b/data_structures/AUTOMAT.js
index e1848cb..3ceda51 100644
--- a/data_structures/AUTOMAT.js
+++ b/data_structures/AUTOMAT.js
@@ -15,15 +15,15 @@ function AUTOMAT () {
 
 	var C2 = [1];
 
-	var exprs = [[NMode.toString()],[Minitial.toString()],[NX.toString()],[sci2exp(X0)],[sci2exp(XP)],[sci2exp(C1)],[sci2exp(C2)]];
+	var exprs = [[string(NMode)],[string(Minitial)],[string(NX)],[sci2exp(X0)],[sci2exp(XP)],[sci2exp(C1)],[sci2exp(C2)]];
 
 	var ipar = [[NMode],[Minitial],[NX],[XP],[C1],[C2]];
 
 	var rpar = [X0];
 
 	var model = scicos_model();
-	model.sim=list("automat",10004);
-	model.in = new ScilabDouble([2*NX+1],[2*NX+1]);
+	model.sim=list(new ScilabString(["automat"]),new ScilabDouble([10004]));
+	model.in1 = new ScilabDouble([2*NX+1],[2*NX+1]);
 	model.out = new ScilabDouble([2],[2*NX]);
 	model.state=ones(2*NX,1);
 	model.nzcross = new ScilabDouble([1]);
@@ -36,4 +36,5 @@ function AUTOMAT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BACKLASH.js b/data_structures/BACKLASH.js
index ad129b9..d407fd7 100644
--- a/data_structures/BACKLASH.js
+++ b/data_structures/BACKLASH.js
@@ -4,8 +4,8 @@ function BACKLASH () {
 	var exprs = ["0";"1";"1"];
 
 	var model = scicos_model();
-	model.sim=list("backlash",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["backlash"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([0],[1]);
 	model.nzcross = new ScilabDouble([2]);
@@ -14,4 +14,5 @@ function BACKLASH () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BARXY.js b/data_structures/BARXY.js
index 4915cf7..5c3cb6a 100644
--- a/data_structures/BARXY.js
+++ b/data_structures/BARXY.js
@@ -10,10 +10,10 @@ function BARXY () {
 	var ymin = -15;
 
 	var ymax = 15;
-	model.sim=list("BARXY_sim",,5);
+	model.sim=list(new ScilabString(["BARXY_sim"]),,new ScilabDouble([5]));
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble();
 	model.evtin = new ScilabDouble([1]);
@@ -23,4 +23,5 @@ function BARXY () {
 	this.x.graphics.in_implicit = new ScilabString(["E",,"E"]);
 	this.x.graphics.out_implicit = new ScilabDouble();
 	this.x.graphics.exprs = new ScilabString(["-15";"15";"-15";"15";"1"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BIGSOM_f.js b/data_structures/BIGSOM_f.js
index 4466cca..69ce1d5 100644
--- a/data_structures/BIGSOM_f.js
+++ b/data_structures/BIGSOM_f.js
@@ -4,8 +4,8 @@ function BIGSOM_f () {
 	var sgn = [[1],[1]];
 
 	var model = scicos_model();
-	model.sim=list("sum",2);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["sum"]),new ScilabDouble([2]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.rpar=new ScilabDouble([sgn]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function BIGSOM_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,,exprs,gr_i);
+	return new BigSom(this.x)
 }
diff --git a/data_structures/BITCLEAR.js b/data_structures/BITCLEAR.js
index 31ce291..3e7aa24 100644
--- a/data_structures/BITCLEAR.js
+++ b/data_structures/BITCLEAR.js
@@ -2,14 +2,14 @@ function BITCLEAR () {
 
 
 	var model = scicos_model();
-	model.sim=list("bit_clear_32",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["bit_clear_32"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([3]);
 	model.outtyp = new ScilabDouble([3]);
-	model.opar=list(int32(0));
+	model.opar=list(new ScilabInteger([0]));
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
@@ -17,4 +17,5 @@ function BITCLEAR () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BITSET.js b/data_structures/BITSET.js
index 278460b..ed7bccf 100644
--- a/data_structures/BITSET.js
+++ b/data_structures/BITSET.js
@@ -2,14 +2,14 @@ function BITSET () {
 
 
 	var model = scicos_model();
-	model.sim=list("bit_set_32",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["bit_set_32"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([3]);
 	model.outtyp = new ScilabDouble([3]);
-	model.opar=list(uint32(0));
+	model.opar=list(new ScilabInteger([0]));
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
@@ -17,4 +17,5 @@ function BITSET () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BOUNCE.js b/data_structures/BOUNCE.js
index fd447db..b2b8ec9 100644
--- a/data_structures/BOUNCE.js
+++ b/data_structures/BOUNCE.js
@@ -13,4 +13,5 @@ function BOUNCE () {
 	k=k+1;
 	ipar(k)=j;
 	k=k+1;
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BOUNCEXY.js b/data_structures/BOUNCEXY.js
index b081730..a0b3134 100644
--- a/data_structures/BOUNCEXY.js
+++ b/data_structures/BOUNCEXY.js
@@ -18,8 +18,8 @@ function BOUNCEXY () {
 	var ymax = 15;
 
 	var model = scicos_model();
-	model.sim=list("bouncexy",4);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["bouncexy"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.intyp = new ScilabDouble([1],[1]);
 	model.evtin = new ScilabDouble([1]);
@@ -39,4 +39,5 @@ function BOUNCEXY () {
 	var z(6*(i-1)+5) = 0.000;
 
 	var z(6*(i-1)+6) = 64.0*360.000;
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/BPLATFORM.js b/data_structures/BPLATFORM.js
index 7a1a394..a7e7da4 100644
--- a/data_structures/BPLATFORM.js
+++ b/data_structures/BPLATFORM.js
@@ -16,16 +16,17 @@ function BPLATFORM () {
 	var ymax = 15;
 
 	var model = scicos_model();
-	model.sim=list("bplatform2",5);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["bplatform2"]),new ScilabDouble([5]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([0]);
 	model.rpar = new ScilabDouble([plen],[csiz],[phi],[xmin],[xmax],[ymin],[ymax]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = model.rpar.toString();
+	var exprs = string(model.rpar);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Bache.js b/data_structures/Bache.js
index 8e46d06..d7d3c4c 100644
--- a/data_structures/Bache.js
+++ b/data_structures/Bache.js
@@ -1,12 +1,12 @@
 function Bache () {
 
 
-	var in = 2;
+	var in1 = 2;
 
 	var out = 3;
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([-(1:in)']);
+	model.in1 = new ScilabDouble([-(1:in1)']);
 	model.out = new ScilabDouble([-(1:out)']);
 
 	var Patm = 1.013E5;
@@ -35,15 +35,16 @@ function Bache () {
 	mo.model = new ScilabString(["Bache"]);
 	mo.inputs = new ScilabString(["Ce1" "Ce2"]);
 	mo.outputs = new ScilabString(["Cs1" "Cs2" "yNiveau"]);
-	mo.parameters=list(["Patm";"A";"ze1";"ze2";"zs1";"zs2";"z0";"T0";"p_rho"],[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]);
+	mo.parameters=list(new ScilabString(["Patm";"A";"ze1";"ze2";"zs1";"zs2";"z0";"T0";"p_rho"]),[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[Patm.toString()],[A.toString()],[ze1.toString()],[ze2.toString()],[zs1.toString()],[zs2.toString()],[z0.toString()],[T0.toString()],[p_rho.toString()]];
+	var exprs = [[string(Patm)],[string(A)],[string(ze1)],[string(ze2)],[string(zs1)],[string(zs2)],[string(z0)],[string(T0)],[string(p_rho)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I";"I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I";"I";"E"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CANIMXY.js b/data_structures/CANIMXY.js
index 3c07d5f..0d1c11c 100644
--- a/data_structures/CANIMXY.js
+++ b/data_structures/CANIMXY.js
@@ -24,8 +24,8 @@ function CANIMXY () {
 	var nbr_curves = 1;
 
 	var model = scicos_model();
-	model.sim=list("canimxy",4);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["canimxy"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.intyp = new ScilabDouble([1],[1]);
 	model.evtin = new ScilabDouble([1]);
@@ -35,8 +35,9 @@ function CANIMXY () {
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[nbr_curves.toString();clrs.toString();siz.toString();win.toString();"[]";"[]"],[xmin.toString()],[xmax.toString()],[ymin.toString()],[ymax.toString()],[N.toString()]];
+	var exprs = [[string(nbr_curves);string(clrs);string(siz);string(win);"[]";"[]"],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CANIMXY3D.js b/data_structures/CANIMXY3D.js
index 927f6ad..a1ec5f1 100644
--- a/data_structures/CANIMXY3D.js
+++ b/data_structures/CANIMXY3D.js
@@ -24,8 +24,8 @@ function CANIMXY3D () {
 	var nbr_curves = 1;
 
 	var model = scicos_model();
-	model.sim=list("canimxy3d",4);
-	model.in = new ScilabDouble([1],[1],[1]);
+	model.sim=list(new ScilabString(["canimxy3d"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1],[1]);
 	model.evtin = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1],[1],[1]);
 	model.intyp = new ScilabDouble([1],[1],[1]);
@@ -35,8 +35,9 @@ function CANIMXY3D () {
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[nbr_curves.toString();strcat(clrs.toString()," ");strcat(siz.toString()," ");win.toString();"[]";"[]";strcat(vec_x.toString()," ");strcat(vec_y.toString()," ");strcat(vec_z.toString()," ");strcat(param3ds.toString()," ")],[N.toString()]];
+	var exprs = [[string(nbr_curves);strcat(string(clrs)," ");strcat(string(siz)," ");string(win);"[]";"[]";strcat(string(vec_x)," ");strcat(string(vec_y)," ");strcat(string(vec_z)," ");strcat(string(param3ds)," ")],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CBLOCK.js b/data_structures/CBLOCK.js
index 791c08f..77eb431 100644
--- a/data_structures/CBLOCK.js
+++ b/data_structures/CBLOCK.js
@@ -1,7 +1,7 @@
 function CBLOCK () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var out = 1;
 
@@ -26,8 +26,8 @@ function CBLOCK () {
 	var ng = 0;
 
 	var model = scicos_model();
-	model.sim=list(" ",2004);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString([" "]),new ScilabDouble([2004]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=new ScilabDouble([out]);
 	model.evtin=clkin;
 	model.evtout=clkout;
@@ -40,8 +40,9 @@ function CBLOCK () {
 	model.dep_ut = new ScilabBoolean([true,false]);
 	model.nzcross=new ScilabDouble([ng]);
 
-	var label = [list([funam,"n",sci2exp(in),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]',[])];
+	var label = list([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(rpar),sci2exp(ipar),sci2exp(auto),"y","n"]',[]);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CBLOCK4.js b/data_structures/CBLOCK4.js
index d8eaffd..c4cfa2c 100644
--- a/data_structures/CBLOCK4.js
+++ b/data_structures/CBLOCK4.js
@@ -4,8 +4,8 @@ function CBLOCK4 () {
 	var funam = "toto";
 
 	var model = scicos_model();
-	model.sim=list(" ",2004);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString([" "]),new ScilabDouble([2004]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -15,7 +15,7 @@ function CBLOCK4 () {
 
 	var label = list([funam;
 	"n";
-	sci2exp([model.in model.in2]);
+	sci2exp([model.in1 model.in2]);
 	sci2exp(model.intyp);
 	sci2exp([model.out model.out2]);
 	sci2exp(model.outtyp);
@@ -35,4 +35,5 @@ function CBLOCK4 () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CCS.js b/data_structures/CCS.js
index 9505e4f..e405427 100644
--- a/data_structures/CCS.js
+++ b/data_structures/CCS.js
@@ -26,4 +26,5 @@ function CCS () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CEVENTSCOPE.js b/data_structures/CEVENTSCOPE.js
index 0f1c4d1..73a3b7e 100644
--- a/data_structures/CEVENTSCOPE.js
+++ b/data_structures/CEVENTSCOPE.js
@@ -14,15 +14,16 @@ function CEVENTSCOPE () {
 	var per = 30;
 
 	var model = scicos_model();
-	model.sim=list("cevscpe",4);
+	model.sim=list(new ScilabString(["cevscpe"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.rpar=new ScilabDouble([per]);
 	model.ipar = new ScilabDouble([win],[1],[...colon_operator(clrs,nclock)],[wpos(,)],[...wdim]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[sci2exp(nclock);strcat(sci2exp(clrs(nclock))," ")],[win.toString()],[sci2exp([])],[sci2exp(wdim)],[per.toString()]];
+	var exprs = [[sci2exp(nclock);strcat(sci2exp(clrs(nclock))," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(per)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CFSCOPE.js b/data_structures/CFSCOPE.js
index f2f6bde..4a0c786 100644
--- a/data_structures/CFSCOPE.js
+++ b/data_structures/CFSCOPE.js
@@ -18,15 +18,16 @@ function CFSCOPE () {
 	var per = 30;
 
 	var model = scicos_model();
-	model.sim=list("cfscope",4);
+	model.sim=list(new ScilabString(["cfscope"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([0],[ymin],[ymax],[per]);
 	model.ipar = new ScilabDouble([win],[1],[N],[clrs],[wpos],[wdim],[1],[1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(clrs.toString()," ")],[win.toString()],[sci2exp([])],[sci2exp(wdim)],[ymin.toString()],[ymax.toString()],[per.toString()],[N.toString()],[[1].toString()]];
+	var exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[string([1])]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLINDUMMY_f.js b/data_structures/CLINDUMMY_f.js
index 1c6b9e5..35ca987 100644
--- a/data_structures/CLINDUMMY_f.js
+++ b/data_structures/CLINDUMMY_f.js
@@ -4,7 +4,7 @@ function CLINDUMMY_f () {
 	var x0 = 0;
 
 	var model = scicos_model();
-	model.sim=list("cdummy",4);
+	model.sim=list(new ScilabString(["cdummy"]),new ScilabDouble([4]));
 	model.state=new ScilabDouble([x0]);
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabDouble();
@@ -12,4 +12,5 @@ function CLINDUMMY_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLKFROM.js b/data_structures/CLKFROM.js
index 500a395..baa40ec 100644
--- a/data_structures/CLKFROM.js
+++ b/data_structures/CLKFROM.js
@@ -12,4 +12,5 @@ function CLKFROM () {
 	var exprs = "A";
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs," ");
 	this.x.graphics.id = new ScilabString(["From"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLKGOTO.js b/data_structures/CLKGOTO.js
index 0a827f8..eede81b 100644
--- a/data_structures/CLKGOTO.js
+++ b/data_structures/CLKGOTO.js
@@ -13,4 +13,5 @@ function CLKGOTO () {
 	var exprs = [["A"],[sci2exp(1)]];
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs," ");
 	this.x.graphics.id = new ScilabString(["Goto"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLKGotoTagVisibility.js b/data_structures/CLKGotoTagVisibility.js
index fec19b6..5a164cf 100644
--- a/data_structures/CLKGotoTagVisibility.js
+++ b/data_structures/CLKGotoTagVisibility.js
@@ -3,7 +3,7 @@ function CLKGotoTagVisibility () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["clkgototagvisibility"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.out = new ScilabDouble();
 	model.out2 = new ScilabDouble();
@@ -19,4 +19,5 @@ function CLKGotoTagVisibility () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLKINV_f.js b/data_structures/CLKINV_f.js
index 843b959..aa2d8dc 100644
--- a/data_structures/CLKINV_f.js
+++ b/data_structures/CLKINV_f.js
@@ -11,8 +11,9 @@ function CLKINV_f () {
 	model.firing = new ScilabDouble([-1]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = prt.toString();
+	var exprs = string(prt);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
+	return new EventInBlock(this.x)
 }
diff --git a/data_structures/CLKOUTV_f.js b/data_structures/CLKOUTV_f.js
index da550dc..32f4ec9 100644
--- a/data_structures/CLKOUTV_f.js
+++ b/data_structures/CLKOUTV_f.js
@@ -11,6 +11,7 @@ function CLKOUTV_f () {
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = prt.toString();
+	var exprs = string(prt);
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs," ");
+	return new EventOutBlock(this.x)
 }
diff --git a/data_structures/CLKSOMV_f.js b/data_structures/CLKSOMV_f.js
index 9ff476d..273ebc8 100644
--- a/data_structures/CLKSOMV_f.js
+++ b/data_structures/CLKSOMV_f.js
@@ -11,4 +11,5 @@ function CLKSOMV_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new RoundBlock(this.x)
 }
diff --git a/data_structures/CLOCK_c.js b/data_structures/CLOCK_c.js
index 5b7dc81..339191e 100644
--- a/data_structures/CLOCK_c.js
+++ b/data_structures/CLOCK_c.js
@@ -44,4 +44,5 @@ function CLOCK_c () {
 	this.x.model.firing = new ScilabBoolean([false]);
 	this.x.model.dep_ut = new ScilabBoolean([false,false]);
 	this.x.model.rpar=diagram;
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLR.js b/data_structures/CLR.js
index 20cce87..d374d40 100644
--- a/data_structures/CLR.js
+++ b/data_structures/CLR.js
@@ -14,8 +14,8 @@ function CLR () {
 	var exprs = ["1";"1+s"];
 
 	var model = scicos_model();
-	model.sim=list("csslti4",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["csslti4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.state=new ScilabDouble([x0]);
 	model.rpar = new ScilabDouble([...colon_operator(A,:)],[...B],[C(,)],[...D]);
@@ -24,4 +24,5 @@ function CLR () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CLSS.js b/data_structures/CLSS.js
index 84f636a..d97157a 100644
--- a/data_structures/CLSS.js
+++ b/data_structures/CLSS.js
@@ -11,13 +11,13 @@ function CLSS () {
 
 	var D = 0;
 
-	var in = 1;
+	var in1 = 1;
 
 	var out = 1;
 
 	var model = scicos_model();
-	model.sim=list("csslti4",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["csslti4"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=new ScilabDouble([out]);
 	model.state=new ScilabDouble([x0]);
 	model.rpar = new ScilabDouble([...colon_operator(A,:)],[...B],[C(,)],[...D]);
@@ -28,4 +28,5 @@ function CLSS () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CMAT3D.js b/data_structures/CMAT3D.js
index 42e9d78..0d2fd8d 100644
--- a/data_structures/CMAT3D.js
+++ b/data_structures/CMAT3D.js
@@ -17,8 +17,8 @@ function CMAT3D () {
 	var size_y = 1;
 
 	var model = scicos_model();
-	model.sim=list("cmat3d",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["cmat3d"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
@@ -27,8 +27,9 @@ function CMAT3D () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(x.toString()," ");strcat(y.toString()," ");"jetcolormap(25.toString()")],[cmin.toString()],[cmax.toString()]];
+	var exprs = [[strcat(string(x)," ");strcat(string(y)," ");string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CMATVIEW.js b/data_structures/CMATVIEW.js
index 55b5dbc..3a03930 100644
--- a/data_structures/CMATVIEW.js
+++ b/data_structures/CMATVIEW.js
@@ -14,8 +14,8 @@ function CMATVIEW () {
 	var beta_c = 1;
 
 	var model = scicos_model();
-	model.sim=list("cmatview",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["cmatview"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
@@ -24,8 +24,9 @@ function CMATVIEW () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [["jetcolormap(25.toString()")],[cmin.toString()],[cmax.toString()]];
+	var exprs = [[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CMSCOPE.js b/data_structures/CMSCOPE.js
index 578eb3c..b4d2e3d 100644
--- a/data_structures/CMSCOPE.js
+++ b/data_structures/CMSCOPE.js
@@ -3,7 +3,7 @@ function CMSCOPE () {
 
 	var win = -1;
 
-	var in = [[1],[1]];
+	var in1 = [[1],[1]];
 
 	var wdim = [[-1],[-1]];
 
@@ -24,18 +24,19 @@ function CMSCOPE () {
 	var period = ...transpose(per);
 
 	var model = scicos_model();
-	model.sim=list("cmscope",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["cmscope"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.in2 = new ScilabDouble([1],[1]);
 	model.intyp = new ScilabDouble([1],[1]);
 	model.evtin = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([0],[...period],[...yy]);
-	model.ipar = new ScilabDouble([win;...colon_operator(size,in,"*")],[N],[...wpos],[...wdim],[...in],[clrs(1,sum(in))]);
+	model.ipar = new ScilabDouble([win;...colon_operator(size,in1,"*")],[N],[...wpos],[...wdim],[...in1],[clrs(1,sum(in1))]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(in.toString()," ");strcat(clrs.toString()," ");win.toString();sci2exp([]);sci2exp([]);strcat(ymin.toString()," ");strcat(ymax.toString()," ");strcat(per.toString()," ")],[N.toString()],[0.toString()],[emptystr()]];
+	var exprs = [[strcat(string(in1)," ");strcat(string(clrs)," ");string(win);sci2exp([]);sci2exp([]);strcat(string(ymin)," ");strcat(string(ymax)," ");strcat(string(per)," ")],[string(N)],[string(0)],[emptystr()]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONST.js b/data_structures/CONST.js
index 0c0d368..b34361e 100644
--- a/data_structures/CONST.js
+++ b/data_structures/CONST.js
@@ -4,8 +4,8 @@ function CONST () {
 	var C = 1;
 
 	var model = scicos_model();
-	model.sim=list("cstblk4",4);
-	model.in = new ScilabDouble();
+	model.sim=list(new ScilabString(["cstblk4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
 	model.rpar=new ScilabDouble([C]);
 	model.blocktype = new ScilabString(["d"]);
@@ -15,4 +15,5 @@ function CONST () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONSTRAINT2_c.js b/data_structures/CONSTRAINT2_c.js
index fc49e38..d24d40c 100644
--- a/data_structures/CONSTRAINT2_c.js
+++ b/data_structures/CONSTRAINT2_c.js
@@ -8,8 +8,8 @@ function CONSTRAINT2_c () {
 	var id = [0];
 
 	var model = scicos_model();
-	model.sim=list("constraint_c",10004);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["constraint_c"]),new ScilabDouble([10004]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1],[1]);
 	model.state = new ScilabDouble([x0],[xd0]);
 	model.ipar=new ScilabDouble([id]);
@@ -20,4 +20,5 @@ function CONSTRAINT2_c () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONSTRAINT_c.js b/data_structures/CONSTRAINT_c.js
index e986197..567ec0f 100644
--- a/data_structures/CONSTRAINT_c.js
+++ b/data_structures/CONSTRAINT_c.js
@@ -4,8 +4,8 @@ function CONSTRAINT_c () {
 	var x0 = [[0],[0]];
 
 	var model = scicos_model();
-	model.sim=list("constraint_c",10004);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["constraint_c"]),new ScilabDouble([10004]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.ipar = new ScilabDouble([0]);
 	model.state=new ScilabDouble([x0]);
@@ -16,4 +16,5 @@ function CONSTRAINT_c () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONST_f.js b/data_structures/CONST_f.js
index ce13cff..1983ae4 100644
--- a/data_structures/CONST_f.js
+++ b/data_structures/CONST_f.js
@@ -4,8 +4,8 @@ function CONST_f () {
 	var C = 1;
 
 	var model = scicos_model();
-	model.sim=list("cstblk",1);
-	model.in = new ScilabDouble();
+	model.sim=list(new ScilabString(["cstblk"]),new ScilabDouble([1]));
+	model.in1 = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
 	model.rpar=new ScilabDouble([C]);
 	model.blocktype = new ScilabString(["d"]);
@@ -15,4 +15,5 @@ function CONST_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONST_m.js b/data_structures/CONST_m.js
index 963e1be..df53c9a 100644
--- a/data_structures/CONST_m.js
+++ b/data_structures/CONST_m.js
@@ -4,8 +4,8 @@ function CONST_m () {
 	var C = [1];
 
 	var model = scicos_model();
-	model.sim=list("cstblk4",4);
-	model.in = new ScilabDouble();
+	model.sim=list(new ScilabString(["cstblk4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble();
 	model.out=size(C,1);
 	model.in2 = new ScilabDouble();
 	model.out2.push(size(C,2));
@@ -18,4 +18,5 @@ function CONST_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CONVERT.js b/data_structures/CONVERT.js
index 1d7cb50..2a467eb 100644
--- a/data_structures/CONVERT.js
+++ b/data_structures/CONVERT.js
@@ -4,8 +4,8 @@ function CONVERT () {
 	var sgn = 2;
 
 	var model = scicos_model();
-	model.sim=list("convert",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["convert"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.out2 = new ScilabDouble([-2]);
@@ -20,4 +20,5 @@ function CONVERT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/COSBLK_f.js b/data_structures/COSBLK_f.js
index fe213ee..bcd2120 100644
--- a/data_structures/COSBLK_f.js
+++ b/data_structures/COSBLK_f.js
@@ -1,15 +1,16 @@
 function COSBLK_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["cosblk"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CSCOPE.js b/data_structures/CSCOPE.js
index fdac275..f67fec9 100644
--- a/data_structures/CSCOPE.js
+++ b/data_structures/CSCOPE.js
@@ -18,8 +18,8 @@ function CSCOPE () {
 	var per = 30;
 
 	var model = scicos_model();
-	model.sim=list("cscope",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["cscope"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([0],[ymin],[ymax],[per]);
@@ -27,8 +27,9 @@ function CSCOPE () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(clrs.toString()," ")],[win.toString()],[sci2exp([])],[sci2exp(wdim)],[ymin.toString()],[ymax.toString()],[per.toString()],[N.toString()],[0.toString()'],[emptystr()]];
+	var exprs = [[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[string(0)'],[emptystr()]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CSCOPXY.js b/data_structures/CSCOPXY.js
index d044b30..17808c5 100644
--- a/data_structures/CSCOPXY.js
+++ b/data_structures/CSCOPXY.js
@@ -22,8 +22,8 @@ function CSCOPXY () {
 	var nbr_curves = 1;
 
 	var model = scicos_model();
-	model.sim=list("cscopxy",4);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["cscopxy"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.intyp = new ScilabDouble([1],[1]);
 	model.evtin = new ScilabDouble([1]);
@@ -32,8 +32,9 @@ function CSCOPXY () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[nbr_curves.toString()],[sci2exp(clrs)],[sci2exp(siz)],[win.toString()],[sci2exp([])],[sci2exp(wdim)],[xmin.toString()],[xmax.toString()],[ymin.toString()],[ymax.toString()],[N.toString()]];
+	var exprs = [[string(nbr_curves)],[sci2exp(clrs)],[sci2exp(siz)],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CSCOPXY3D.js b/data_structures/CSCOPXY3D.js
index 849e687..7a91623 100644
--- a/data_structures/CSCOPXY3D.js
+++ b/data_structures/CSCOPXY3D.js
@@ -24,8 +24,8 @@ function CSCOPXY3D () {
 	var nbr_curves = 1;
 
 	var model = scicos_model();
-	model.sim=list("cscopxy3d",4);
-	model.in = new ScilabDouble([1],[1],[1]);
+	model.sim=list(new ScilabString(["cscopxy3d"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1],[1]);
 	model.in2 = new ScilabDouble([1],[1],[1]);
 	model.intyp = new ScilabDouble([1],[1],[1]);
 	model.evtin = new ScilabDouble([1]);
@@ -34,8 +34,9 @@ function CSCOPXY3D () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[nbr_curves.toString();strcat(clrs.toString()," ");strcat(siz.toString()," ");win.toString();sci2exp([]);sci2exp(wdim);strcat(vec_x.toString()," ");strcat(vec_y.toString()," ");strcat(vec_z.toString()," ");strcat(param3ds.toString()," ")],[N.toString()]];
+	var exprs = [[string(nbr_curves);strcat(string(clrs)," ");strcat(string(siz)," ");string(win);sci2exp([]);sci2exp(wdim);strcat(string(vec_x)," ");strcat(string(vec_y)," ");strcat(string(vec_z)," ");strcat(string(param3ds)," ")],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CUMSUM.js b/data_structures/CUMSUM.js
index 7523d2a..6c076cf 100644
--- a/data_structures/CUMSUM.js
+++ b/data_structures/CUMSUM.js
@@ -7,7 +7,7 @@ function CUMSUM () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function CUMSUM () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CURV_f.js b/data_structures/CURV_f.js
index 7cece9a..49e00bf 100644
--- a/data_structures/CURV_f.js
+++ b/data_structures/CURV_f.js
@@ -15,7 +15,7 @@ function CURV_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["intplt"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([xx],[yy],[...rect]);
 	model.ipar = new ScilabDouble([size(xx,1)],[...axisdata]);
@@ -24,4 +24,5 @@ function CURV_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CVS.js b/data_structures/CVS.js
index 2bbd53b..5bfb5f9 100644
--- a/data_structures/CVS.js
+++ b/data_structures/CVS.js
@@ -26,4 +26,5 @@ function CVS () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Capacitor.js b/data_structures/Capacitor.js
index 12760cb..c83bb8e 100644
--- a/data_structures/Capacitor.js
+++ b/data_structures/Capacitor.js
@@ -13,15 +13,16 @@ function Capacitor () {
 	mo.model = new ScilabString(["Capacitor"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list(["C","v"],list(C,v),[0,1]);
+	mo.parameters=list(new ScilabString(["C"),new ScilabString(["v"]]),list(C,v),new ScilabDouble([0),new ScilabDouble([1]]));
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[C],[v].toString()];
+	var exprs = string([C],[v]);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,1.1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,1.1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ConstantVoltage.js b/data_structures/ConstantVoltage.js
index de2d653..add8be1 100644
--- a/data_structures/ConstantVoltage.js
+++ b/data_structures/ConstantVoltage.js
@@ -5,7 +5,7 @@ function ConstantVoltage () {
 
 	var model = scicos_model();
 	model.rpar=new ScilabDouble([V]);
-	model.in = new ScilabDouble([1],[model.out=1]);
+	model.in1 = new ScilabDouble([1],[model.out=1]);
 	model.sim = new ScilabString(["ConstantVoltage"]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
@@ -14,13 +14,14 @@ function ConstantVoltage () {
 	mo.model = new ScilabString(["ConstantVoltage"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list("V",list(V));
+	mo.parameters=list(new ScilabString(["V"]),list(V));
 	model.equations=mo;
 
-	var exprs = V.toString();
+	var exprs = string(V);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([1.5,1.1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([1.5,1.1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Counter.js b/data_structures/Counter.js
index d4daec1..9fcff45 100644
--- a/data_structures/Counter.js
+++ b/data_structures/Counter.js
@@ -8,7 +8,7 @@ function Counter () {
 	var rule = 1;
 
 	var model = scicos_model();
-	model.sim=list("counter",4);
+	model.sim=list(new ScilabString(["counter"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
@@ -17,8 +17,9 @@ function Counter () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[minim.toString()],[maxim.toString()],[rule.toString()]];
+	var exprs = [[string(minim)],[string(maxim)],[string(rule)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/CurrentSensor.js b/data_structures/CurrentSensor.js
index 8bb3dde..386fa14 100644
--- a/data_structures/CurrentSensor.js
+++ b/data_structures/CurrentSensor.js
@@ -2,7 +2,7 @@ function CurrentSensor () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1],[,1]);
 	model.sim = new ScilabString(["CurrentSensor"]);
 	model.blocktype = new ScilabString(["c"]);
@@ -17,7 +17,8 @@ function CurrentSensor () {
 	var exprs = [];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I";"E"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DEADBAND.js b/data_structures/DEADBAND.js
index a9867ed..b5c34e3 100644
--- a/data_structures/DEADBAND.js
+++ b/data_structures/DEADBAND.js
@@ -8,8 +8,8 @@ function DEADBAND () {
 	var rpar = [[maxp],[minp]];
 
 	var model = scicos_model();
-	model.sim=list("deadband",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["deadband"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.nzcross = new ScilabDouble([2]);
 	model.nmode = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -17,8 +17,9 @@ function DEADBAND () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[maxp.toString()],[minp.toString()],[model.nmode.toString()]];
+	var exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DEBUG.js b/data_structures/DEBUG.js
index e34387c..6d610ad 100644
--- a/data_structures/DEBUG.js
+++ b/data_structures/DEBUG.js
@@ -2,11 +2,12 @@ function DEBUG () {
 
 
 	var model = scicos_model();
-	model.sim=list("%debug_scicos",99);
+	model.sim=list(new ScilabString(["%debug_scicos"]),new ScilabDouble([99]));
 	model.blocktype = new ScilabString(["d"]);
 
 	var exprs = list("","xcos_debug_gui(flag,block);");
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([8,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DELAYV_f.js b/data_structures/DELAYV_f.js
index 3141ce6..f262231 100644
--- a/data_structures/DELAYV_f.js
+++ b/data_structures/DELAYV_f.js
@@ -10,8 +10,8 @@ function DELAYV_f () {
 	var T = 1;
 
 	var model = scicos_model();
-	model.sim=list("delayv",1);
-	model.in = new ScilabDouble([nin],[1]);
+	model.sim=list(new ScilabString(["delayv"]),new ScilabDouble([1]));
+	model.in1 = new ScilabDouble([nin],[1]);
 	model.out=new ScilabDouble([nin]);
 	model.evtin = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1],[1]);
@@ -21,8 +21,9 @@ function DELAYV_f () {
 	model.firing = new ScilabDouble([0,-1]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[nin....colon_operator(toString,);strcat(z0(1,$-1.toString()),";")],[T.toString()]];
+	var exprs = [[...colon_operator(string,nin);strcat(string(z0(1,$-1)),";")],[string(T)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DELAY_f.js b/data_structures/DELAY_f.js
index a323a8f..9f2ea31 100644
--- a/data_structures/DELAY_f.js
+++ b/data_structures/DELAY_f.js
@@ -59,7 +59,7 @@ function DELAY_f () {
 	this.x.graphics.pin = new ScilabDouble([0]);
 	this.x.graphics.pout = new ScilabDouble([0]);
 	this.x.model.sim = new ScilabString(["csuper"]);
-	this.x.model.in = new ScilabDouble([1]);
+	this.x.model.in1 = new ScilabDouble([1]);
 	this.x.model.out = new ScilabDouble([1]);
 	this.x.model.blocktype = new ScilabString(["h"]);
 	this.x.model.dep_ut = new ScilabBoolean([false,false]);
@@ -68,4 +68,5 @@ function DELAY_f () {
 	this.x.graphics.in_style = new ScilabString([""]);
 	this.x.graphics.out_implicit = new ScilabString(["E"]);
 	this.x.graphics.out_style = new ScilabString([""]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DEMUX.js b/data_structures/DEMUX.js
index b84b2cf..083b3ec 100644
--- a/data_structures/DEMUX.js
+++ b/data_structures/DEMUX.js
@@ -4,16 +4,17 @@ function DEMUX () {
 	var out = 2;
 
 	var model = scicos_model();
-	model.sim=list("multiplex",4);
-	model.in = new ScilabDouble([0]);
+	model.sim=list(new ScilabString(["multiplex"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([0]);
 	model.out=-...transpose([1:out]);
 	model.ipar=new ScilabDouble([out]);
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = out.toString();
+	var exprs = string(out);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DEMUX_f.js b/data_structures/DEMUX_f.js
index 0b6a938..161b4a1 100644
--- a/data_structures/DEMUX_f.js
+++ b/data_structures/DEMUX_f.js
@@ -4,16 +4,17 @@ function DEMUX_f () {
 	var out = 2;
 
 	var model = scicos_model();
-	model.sim=list("demux",1);
-	model.in = new ScilabDouble([0]);
+	model.sim=list(new ScilabString(["demux"]),new ScilabDouble([1]));
+	model.in1 = new ScilabDouble([0]);
 	model.out=-...transpose([1:out]);
 	model.ipar=new ScilabDouble([out]);
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = out.toString();
+	var exprs = string(out);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DERIV.js b/data_structures/DERIV.js
index 7a358ad..12f3503 100644
--- a/data_structures/DERIV.js
+++ b/data_structures/DERIV.js
@@ -2,8 +2,8 @@ function DERIV () {
 
 
 	var model = scicos_model();
-	model.sim=list("deriv",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["deriv"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["x"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -12,4 +12,5 @@ function DERIV () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DFLIPFLOP.js b/data_structures/DFLIPFLOP.js
index 72616e4..ef30761 100644
--- a/data_structures/DFLIPFLOP.js
+++ b/data_structures/DFLIPFLOP.js
@@ -1,86 +1,86 @@
 function DFLIPFLOP () {
 
 
-	var scs_m = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20;20],flip=%t,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=%t,theta=0,exprs=["1";"1"],pin=29,pout=[],pein=22,peout=[16;44],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=%t,theta=0,exprs=["2";"1";"5";"0"],pin=[11;39],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=%t,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20;20],flip=%t,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(new ScilabInteger([0])),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=%t,theta=0,exprs=["1";"1"],pin=29,pout=[],pein=22,peout=[16;44],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=%t,theta=0,exprs=["2";"1";"5";"0"],pin=[11;39],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=%t,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([221.46044),yy: new ScilabDouble([280.24498),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([4,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([138.19704),yy: new ScilabDouble([273.44465),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([38,1,1])}));
-	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[373.24106,309.46812],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=36,pout=13,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[199.48466,398.2166],sz=[20,20],flip=%t,theta=0,exprs="3",pin=[],pout=9,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[373.24106,309.46812],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=36,pout=13,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[199.48466,398.2166],sz=[20,20],flip=%t,theta=0,exprs="3",pin=[],pout=9,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([219.48466),yy: new ScilabDouble([408.2166),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([8,1,0]),to: new ScilabDouble([28,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=11,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=11,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([124.31759),yy: new ScilabDouble([286.91165),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([10,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[457.40928,320.20131],sz=[20,20],flip=%t,theta=0,exprs="2",pin=13,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[457.40928,320.20131],sz=[20,20],flip=%t,theta=0,exprs="2",pin=13,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([441.81249),yy: new ScilabDouble([329.46812),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([7,1,0]),to: new ScilabDouble([12,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[376.4669,270.83282],sz=[20,20],flip=%t,theta=0,exprs="1",pin=37,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[376.4669,270.83282],sz=[20,20],flip=%t,theta=0,exprs="1",pin=37,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title="Untitled",tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=[],void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="ANDLOG_f",graphics=scicos_graphics(orig=[194,133],sz=[60,60],flip=%t,theta=0,exprs=[],pin=[],pout=9,pein=[4;11],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="andlog",in=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[1;1],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[149,287],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=[],peout=4,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="CLKOUT_f",graphics=scicos_graphics(orig=[450,83],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title="Untitled",tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=[],void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="ANDLOG_f",graphics=scicos_graphics(orig=[194,133],sz=[60,60],flip=%t,theta=0,exprs=[],pin=[],pout=9,pein=[4;11],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="andlog",in1=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[1;1],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[149,287],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=[],peout=4,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKOUT_f",graphics=scicos_graphics(orig=[450,83],sz=[20,20],flip=%t,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([169),yy: new ScilabDouble([297),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1]),to: new ScilabDouble([1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[141,330],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=[],pein=[],peout=6,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[141,330],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=[],pein=[],peout=6,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([161),yy: new ScilabDouble([340),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([5,1]),to: new ScilabDouble([10,1])}));
-	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[331,137],sz=[60,60],flip=%t,theta=0,exprs=["1";"1"],pin=9,pout=[],pein=12,peout=[8;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[331,137],sz=[60,60],flip=%t,theta=0,exprs=["1";"1"],pin=9,pout=[],pein=12,peout=[8;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([351),yy: new ScilabDouble([131.29),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([7,1]),to: new ScilabDouble([3,1])}));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([262.57),yy: new ScilabDouble([163),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1]),to: new ScilabDouble([7,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[234;275.78348],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=6,peout=[11;12],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[234;275.78348],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=6,peout=[11;12],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([234),yy: new ScilabDouble([275.78),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([10,1]),to: new ScilabDouble([1,2])}));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([234),yy: new ScilabDouble([275.78),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([10,2]),to: new ScilabDouble([7,1])}));
-	scs_m.objs.push(scicos_block(gui="ANDBLK",graphics=scicos_graphics(orig=[233.73039,318.74407],sz=[40,40],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=[19;16],peout=17,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="csuper",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1;1],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=%f,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="ANDBLK",graphics=scicos_graphics(orig=[233.73039,318.74407],sz=[40,40],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=[19;16],peout=17,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1;1],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=%f,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([259.98293),yy: new ScilabDouble([372.50232),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([15,2,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([253.73039),yy: new ScilabDouble([313.02978),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([15,1,0]),to: new ScilabDouble([41,1,1])}));
-	scs_m_1.push(scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())));
-	scs_m_1.objs.push(scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=%t,theta=0,exprs="1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=1,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=3,pout=[],pein=[],peout=[7;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.push(tlist(new ScilabString([600,450,0,0,600,450]),props=scicos_params(wpar=,Title=,tol=,tf=30,context=" ",void1=,options=tlist(,list(%t,new ScilabDouble([33)]),,,list(,),),void2=,void3=,doc=list())));
+	scs_m_1.objs.push(scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=%t,theta=0,exprs="1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=1,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=3,pout=[],pein=[],peout=[7;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([357.15774),yy: new ScilabDouble([277.1131),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([2,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([260.01488),yy: new ScilabDouble([277.1131),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([4,1,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=7,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([408.28869),yy: new ScilabDouble([241.39881),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([6,1,1])}));
-	scs_m.objs.push(scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[133.90637,385.342],sz=[60,40],flip=%t,theta=0,exprs=[],pin=26,pout=[],pein=[],peout=19,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[133.90637,385.342],sz=[60,40],flip=%t,theta=0,exprs=[],pin=26,pout=[],pein=[],peout=19,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([163.90637),yy: new ScilabDouble([379.62771),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([18,1,0]),to: new ScilabDouble([15,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[79.594811,395.47647],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=23,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.push(scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["Extract_Activation","./"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())));
-	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[150.65045,143.82208],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=6,pout=[],pein=[],peout=[3;4],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="CLKSOMV_f",graphics=scicos_graphics(orig=[169.82143,96.146231],sz=[16.666667,16.666667],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=[3;4;0],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sum",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1;1;1],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[79.594811,395.47647],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=23,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.push(tlist(new ScilabString([600,450,0,0,600,450]),props=scicos_params(wpar=,Title=,tol=,tf=30,context=" ",void1=,options=tlist(,list(%t,new ScilabDouble([33)]),,,list(,),),void2=,void3=,doc=list())));
+	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[150.65045,143.82208],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=6,pout=[],pein=[],peout=[3;4],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKSOMV_f",graphics=scicos_graphics(orig=[169.82143,96.146231],sz=[16.666667,16.666667],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=[3;4;0],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sum",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1;1;1],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([170.65045),yy: new ScilabDouble([138.10779),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([2,1,1])}));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([190.65045),yy: new ScilabDouble([138.10779),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([1,2,0]),to: new ScilabDouble([2,2,1])}));
-	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[102.07902,163.82208],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[102.07902,163.82208],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([122.07902),yy: new ScilabDouble([173.82208),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([5,1,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[168.15476,38.527183],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[168.15476,38.527183],sz=[20,30],flip=%t,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([178.15476),yy: new ScilabDouble([98.527183),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([7,1,1])}));
-	scs_m.objs.push(scicos_block(gui="Extract_Activation",graphics=scicos_graphics(orig=[239.82193,456.57677],sz=[60,40],flip=%t,theta=0,exprs=[],pin=31,pout=[],pein=[],peout=22,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="Extract_Activation",graphics=scicos_graphics(orig=[239.82193,456.57677],sz=[60,40],flip=%t,theta=0,exprs=[],pin=31,pout=[],pein=[],peout=22,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([269.82193),yy: new ScilabDouble([450.86248),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([21,1,0]),to: new ScilabDouble([2,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([99.594811),yy: new ScilabDouble([405.47647),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([20,1,0]),to: new ScilabDouble([25,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SUM_f",graphics=scicos_graphics(orig=[200.5252,469.13173],sz=[16.666667,16.666667],flip=%t,theta=0,exprs=[],pin=[27;0;30],pout=31,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("plusblk",2),in=[-1;-1;-1],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[110.25582;405.42077],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=23,pout=[26;27],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SUM_f",graphics=scicos_graphics(orig=[200.5252,469.13173],sz=[16.666667,16.666667],flip=%t,theta=0,exprs=[],pin=[27;0;30],pout=31,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("plusblk",2),in1=[-1;-1;-1],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[110.25582;405.42077],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=23,pout=[26;27],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([110.25582),yy: new ScilabDouble([405.42077),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([25,1,0]),to: new ScilabDouble([18,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([110.25582),yy: new ScilabDouble([405.42077),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([25,2,0]),to: new ScilabDouble([24,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[222.54128;408.2166],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=9,pout=[29;30],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[222.54128;408.2166],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=9,pout=[29;30],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([222.54128),yy: new ScilabDouble([408.2166),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([28,1,0]),to: new ScilabDouble([2,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([222.54128),yy: new ScilabDouble([408.2166),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([28,2,0]),to: new ScilabDouble([24,3,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([219.57282),yy: new ScilabDouble([477.46506),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([24,1,0]),to: new ScilabDouble([21,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[298.86371,253.57321],sz=[40,40],flip=%t,theta=0,exprs=["5";"2";"1"],pin=[33;40],pout=34,pein=[43;44],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[1;1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[298.86371,253.57321],sz=[40,40],flip=%t,theta=0,exprs=["5";"2";"1"],pin=[33;40],pout=34,pein=[43;44],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in1=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[1;1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([282.29299),yy: new ScilabDouble([280.24498),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([4,1,0]),to: new ScilabDouble([32,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([347.43514),yy: new ScilabDouble([273.57321),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([32,1,0]),to: new ScilabDouble([35,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[357.57328,280.83282],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=34,pout=[36;37],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[357.57328,280.83282],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=34,pout=[36;37],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([357.57328),yy: new ScilabDouble([280.83282),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([35,1,0]),to: new ScilabDouble([7,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([357.57328),yy: new ScilabDouble([280.83282),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([35,2,0]),to: new ScilabDouble([14,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[140.34523;273.49157],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=6,pout=[39;40],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[140.34523;273.49157],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=6,pout=[39;40],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([140.34523),yy: new ScilabDouble([273.49157),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([38,1,0]),to: new ScilabDouble([3,2,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([140.34523),yy: new ScilabDouble([273.49157),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([38,2,0]),to: new ScilabDouble([32,2,1])}));
-	scs_m.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[253.72572;309.29537],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=17,peout=[42;43],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[253.72572;309.29537],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=17,peout=[42;43],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([253.72572),yy: new ScilabDouble([309.29537),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([41,1,0]),to: new ScilabDouble([4,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([253.72572),yy: new ScilabDouble([309.29537),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([41,2,0]),to: new ScilabDouble([32,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([279.98293),yy: new ScilabDouble([372.50232),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,2,0]),to: new ScilabDouble([32,2,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1],[1],[1]);
+	model.in1 = new ScilabDouble([1],[1],[1]);
 	model.in2 = new ScilabDouble([1],[1],[1]);
 	model.out = new ScilabDouble([1],[1]);
 	model.out2 = new ScilabDouble([1],[1]);
@@ -93,4 +93,5 @@ function DFLIPFLOP () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DIFF_f.js b/data_structures/DIFF_f.js
index c14528b..18b0711 100644
--- a/data_structures/DIFF_f.js
+++ b/data_structures/DIFF_f.js
@@ -4,8 +4,8 @@ function DIFF_f () {
 	var x0 = [[0],[0]];
 
 	var model = scicos_model();
-	model.sim=list("diffblk",10001);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["diffblk"]),new ScilabDouble([10001]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.state=new ScilabDouble([x0]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function DIFF_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DLATCH.js b/data_structures/DLATCH.js
index e7402f2..f2d9e89 100644
--- a/data_structures/DLATCH.js
+++ b/data_structures/DLATCH.js
@@ -1,30 +1,30 @@
 function DLATCH () {
 
 
-	var scs_m = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20;20],flip=%t,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=%t,theta=0,exprs=["0";"1"],pin=13,pout=[],pein=[],peout=[6;0],gr_i=list(["txt=[''If,in>0'';'','';'',then, , else'']";"xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'');"],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=%t,theta=0,exprs=["2";"1";"5";"0"],pin=[15;7],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[''Logical,Op,'';OPER],sz(1),sz(2),''fill'');",8),id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=%t,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),''S/H'',sz(1),sz(2),''fill'')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20;20],flip=%t,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(new ScilabInteger([0])),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=%t,theta=0,exprs=["0";"1"],pin=13,pout=[],pein=[],peout=[6;0],gr_i=list(["txt=[''If,in>0'';'','';'',then, , else'']";"xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'');"],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=1,nmode=1,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=%t,theta=0,exprs=["2";"1";"5";"0"],pin=[15;7],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[''Logical,Op,'';OPER],sz(1),sz(2),''fill'');",8),id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1;-1],in2=[-2;-2],intyp=[5;5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=%t,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),''S/H'',sz(1),sz(2),''fill'')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([221.46044),yy: new ScilabDouble([280.24498),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([4,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([253.37693),yy: new ScilabDouble([314.59108),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([4,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([138.19704),yy: new ScilabDouble([273.44465),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([3,2,1])}));
-	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[317.46698,309.46812],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=11,pout=17,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[''Logical,Op,'';OPER],sz(1),sz(2),''fill'');",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[317.46698,309.46812],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=11,pout=17,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[''Logical,Op,'';OPER],sz(1),sz(2),''fill'');",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([282.29299),yy: new ScilabDouble([280.24498),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([4,1,0]),to: new ScilabDouble([10,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[305.09603,280.83282],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=9,pout=[11;19],pein=[],peout=[],gr_i=list([],8),id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[305.09603,280.83282],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=9,pout=[11;19],pein=[],peout=[],gr_i=list([],8),id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([305.09603),yy: new ScilabDouble([280.83282),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([10,1,0]),to: new ScilabDouble([8,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[184.8055,340.30536],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=13,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[184.8055,340.30536],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=13,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([204.8055),yy: new ScilabDouble([350.30536),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([12,1,0]),to: new ScilabDouble([2,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=15,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=15,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([124.31759),yy: new ScilabDouble([286.91165),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([14,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[406.03841,319.46812],sz=[20,20],flip=%t,theta=0,exprs="2",pin=17,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[406.03841,319.46812],sz=[20,20],flip=%t,theta=0,exprs="2",pin=17,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([386.03841),yy: new ScilabDouble([329.46812),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([8,1,0]),to: new ScilabDouble([16,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=%t,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=%t,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([305.09603),yy: new ScilabDouble([280.83282),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([10,2,0]),to: new ScilabDouble([18,1,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1],[1]);
+	model.in1 = new ScilabDouble([1],[1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1],[1]);
 	model.out2 = new ScilabDouble([1],[1]);
@@ -37,4 +37,5 @@ function DLATCH () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DLR.js b/data_structures/DLR.js
index 27471c8..a42f9d9 100644
--- a/data_structures/DLR.js
+++ b/data_structures/DLR.js
@@ -14,8 +14,8 @@ function DLR () {
 	var exprs = ["1";"1+z"];
 
 	var model = scicos_model();
-	model.sim=list("dsslti4",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["dsslti4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.dstate=...x0;
@@ -25,4 +25,5 @@ function DLR () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DLRADAPT_f.js b/data_structures/DLRADAPT_f.js
index 0b420b7..08e7047 100644
--- a/data_structures/DLRADAPT_f.js
+++ b/data_structures/DLRADAPT_f.js
@@ -15,7 +15,7 @@ function DLRADAPT_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["dlradp"]);
-	model.in = new ScilabDouble([1],[1]);
+	model.in1 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([last_u],[last_y]);
@@ -29,4 +29,5 @@ function DLRADAPT_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DLSS.js b/data_structures/DLSS.js
index 9dbfc7b..e946ae2 100644
--- a/data_structures/DLSS.js
+++ b/data_structures/DLSS.js
@@ -12,8 +12,8 @@ function DLSS () {
 	var D = 0;
 
 	var model = scicos_model();
-	model.sim=list("dsslti4",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["dsslti4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.dstate=...x0;
@@ -25,4 +25,5 @@ function DLSS () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DOLLAR.js b/data_structures/DOLLAR.js
index d30c644..b88da24 100644
--- a/data_structures/DOLLAR.js
+++ b/data_structures/DOLLAR.js
@@ -5,14 +5,14 @@ function DOLLAR () {
 
 	var inh = 0;
 
-	var in = 1;
+	var in1 = 1;
 
-	var exprs = [[z],[inh].toString()];
+	var exprs = string([z],[inh]);
 
 	var model = scicos_model();
-	model.sim=list("dollar4",4);
-	model.in=new ScilabDouble([in]);
-	model.out=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["dollar4"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
+	model.out=new ScilabDouble([in1]);
 	model.evtin = new ScilabDouble([1-inh]);
 	model.dstate=new ScilabDouble([z]);
 	model.blocktype = new ScilabString(["d"]);
@@ -20,4 +20,5 @@ function DOLLAR () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DOLLAR_f.js b/data_structures/DOLLAR_f.js
index b1b3013..19d03d4 100644
--- a/data_structures/DOLLAR_f.js
+++ b/data_structures/DOLLAR_f.js
@@ -5,14 +5,14 @@ function DOLLAR_f () {
 
 	var inh = 0;
 
-	var in = 1;
+	var in1 = 1;
 
-	var exprs = [[z],[inh].toString()];
+	var exprs = string([z],[inh]);
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["dollar"]);
-	model.in=new ScilabDouble([in]);
-	model.out=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
+	model.out=new ScilabDouble([in1]);
 	model.evtin = new ScilabDouble([1-inh]);
 	model.dstate=new ScilabDouble([z]);
 	model.blocktype = new ScilabString(["d"]);
@@ -20,4 +20,5 @@ function DOLLAR_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/DOLLAR_m.js b/data_structures/DOLLAR_m.js
index bc45e45..155f35b 100644
--- a/data_structures/DOLLAR_m.js
+++ b/data_structures/DOLLAR_m.js
@@ -5,14 +5,14 @@ function DOLLAR_m () {
 
 	var inh = 0;
 
-	var in = 1;
+	var in1 = 1;
 
-	var exprs = [[z],[inh].toString()];
+	var exprs = string([z],[inh]);
 
 	var model = scicos_model();
-	model.sim=list("dollar4",4);
-	model.in=new ScilabDouble([in]);
-	model.out=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["dollar4"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
+	model.out=new ScilabDouble([in1]);
 	model.evtin = new ScilabDouble([1-inh]);
 	model.dstate=new ScilabDouble([z]);
 	model.blocktype = new ScilabString(["d"]);
@@ -20,4 +20,5 @@ function DOLLAR_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Diode.js b/data_structures/Diode.js
index 8806591..3c2d979 100644
--- a/data_structures/Diode.js
+++ b/data_structures/Diode.js
@@ -11,7 +11,7 @@ function Diode () {
 
 	var model = scicos_model();
 	model.rpar = new ScilabDouble([Ids],[Vt],[Maxexp],[R]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.sim = new ScilabString(["Diode"]);
 	model.blocktype = new ScilabString(["c"]);
@@ -21,13 +21,14 @@ function Diode () {
 	mo.model = new ScilabString(["Diode"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list(["Ids","Vt","Maxexp","R"],list(Ids,Vt,Maxexp,R));
+	mo.parameters=list(new ScilabString(["Ids"),new ScilabString(["Vt"]),new ScilabString(["Maxexp"]),new ScilabString(["R"]]),list(Ids,Vt,Maxexp,R));
 	model.equations=mo;
 
-	var exprs = [[Ids],[Vt],[Maxexp],[R].toString()];
+	var exprs = string([Ids],[Vt],[Maxexp],[R]);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EDGE_TRIGGER.js b/data_structures/EDGE_TRIGGER.js
index 5125194..0ca790b 100644
--- a/data_structures/EDGE_TRIGGER.js
+++ b/data_structures/EDGE_TRIGGER.js
@@ -77,10 +77,11 @@ function EDGE_TRIGGER () {
 	clear blk lnk
 	model=scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar=scs_m_1;
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ENDBLK.js b/data_structures/ENDBLK.js
index 9d29f10..cc253ef 100644
--- a/data_structures/ENDBLK.js
+++ b/data_structures/ENDBLK.js
@@ -1,12 +1,13 @@
 function ENDBLK () {
 
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,0,7,1.4],Title="ENDBLK",tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=%t,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000E+08,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,0,7,1.4],Title="ENDBLK",tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=%t,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000E+08,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([292.104),yy: new ScilabDouble([243.40305),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([1,1,1])}));
 
-	var model = [scicos_model(sim="csuper",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list())];
+	var model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list());
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/END_c.js b/data_structures/END_c.js
index 51aac62..027d6ca 100644
--- a/data_structures/END_c.js
+++ b/data_structures/END_c.js
@@ -4,15 +4,16 @@ function END_c () {
 	var tf = 100000000;
 
 	var model = scicos_model();
-	model.sim=list("scicosexit",4);
+	model.sim=list(new ScilabString(["scicosexit"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.firing=new ScilabDouble([tf]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = tf.toString();
+	var exprs = string(tf);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ESELECT_f.js b/data_structures/ESELECT_f.js
index 6428ceb..7831538 100644
--- a/data_structures/ESELECT_f.js
+++ b/data_structures/ESELECT_f.js
@@ -4,8 +4,8 @@ function ESELECT_f () {
 	var out = 2;
 
 	var model = scicos_model();
-	model.sim=list("eselect",-2);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["eselect"]),new ScilabDouble([-2]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([-1]);
 	model.evtin = new ScilabDouble([1]);
@@ -18,6 +18,7 @@ function ESELECT_f () {
 
 	var gr_i = [];
 
-	var exprs = [[out.toString()],[1.toString()],[model.nmode.toString()]];
+	var exprs = [[string(out)],[string(1)],[string(model.nmode)]];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EVTDLY_c.js b/data_structures/EVTDLY_c.js
index 7c573aa..7ada20f 100644
--- a/data_structures/EVTDLY_c.js
+++ b/data_structures/EVTDLY_c.js
@@ -6,7 +6,7 @@ function EVTDLY_c () {
 	var ff = 0.0;
 
 	var model = scicos_model();
-	model.sim=list("evtdly4",4);
+	model.sim=list(new ScilabString(["evtdly4"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([dt],[ff]);
@@ -14,8 +14,9 @@ function EVTDLY_c () {
 	model.firing=new ScilabDouble([ff]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[dt.toString()],[sci2exp(ff)]];
+	var exprs = [[string(dt)],[sci2exp(ff)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EVTGEN_f.js b/data_structures/EVTGEN_f.js
index a7a2d26..dc7754e 100644
--- a/data_structures/EVTGEN_f.js
+++ b/data_structures/EVTGEN_f.js
@@ -10,8 +10,9 @@ function EVTGEN_f () {
 	model.firing=new ScilabDouble([tt]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = tt.toString();
+	var exprs = string(tt);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EVTVARDLY.js b/data_structures/EVTVARDLY.js
index 99ff4f9..075c318 100644
--- a/data_structures/EVTVARDLY.js
+++ b/data_structures/EVTVARDLY.js
@@ -2,8 +2,8 @@ function EVTVARDLY () {
 
 
 	var model = scicos_model();
-	model.sim=list("evtvardly",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["evtvardly"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.blocktype = new ScilabString(["d"]);
@@ -11,8 +11,9 @@ function EVTVARDLY () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = model.firing.toString();
+	var exprs = string(model.firing);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXPBLK_m.js b/data_structures/EXPBLK_m.js
index b85018c..7cfd9af 100644
--- a/data_structures/EXPBLK_m.js
+++ b/data_structures/EXPBLK_m.js
@@ -1,13 +1,13 @@
 function EXPBLK_m () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var a = %e;
 
 	var model = scicos_model();
-	model.sim=list("expblk_m",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["expblk_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.out = new ScilabDouble([-1]);
 	model.out2 = new ScilabDouble([-2]);
@@ -21,4 +21,5 @@ function EXPBLK_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXPRESSION.js b/data_structures/EXPRESSION.js
index bbb3b5e..aad864c 100644
--- a/data_structures/EXPRESSION.js
+++ b/data_structures/EXPRESSION.js
@@ -1,7 +1,7 @@
 function EXPRESSION () {
 
 
-	var in = [[1],[1]];
+	var in1 = [[1],[1]];
 
 	var out = 1;
 
@@ -11,8 +11,8 @@ function EXPRESSION () {
 	var [%ok1,ipar,rpar,nz] = compile_expr(%foo);
 
 	var model = scicos_model();
-	model.sim=list("evaluate_expr",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["evaluate_expr"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=new ScilabDouble([out]);
 	model.rpar=rpar;
 	model.ipar=ipar;
@@ -20,8 +20,9 @@ function EXPRESSION () {
 	model.nmode=nz;
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [size(in,"*".toString());txt;"1"];
+	var exprs = [string(size(in1,"*"));txt;"1"];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXTRACT.js b/data_structures/EXTRACT.js
index 7ca3df9..71f82b7 100644
--- a/data_structures/EXTRACT.js
+++ b/data_structures/EXTRACT.js
@@ -7,7 +7,7 @@ function EXTRACT () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -27,4 +27,5 @@ function EXTRACT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXTRACTBITS.js b/data_structures/EXTRACTBITS.js
index ccd2899..a7e621b 100644
--- a/data_structures/EXTRACTBITS.js
+++ b/data_structures/EXTRACTBITS.js
@@ -4,8 +4,8 @@ function EXTRACTBITS () {
 	var numb = [];
 
 	var model = scicos_model();
-	model.sim=list("extract_bit_32_UH0",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["extract_bit_32_UH0"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
@@ -19,4 +19,5 @@ function EXTRACTBITS () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXTRACTOR.js b/data_structures/EXTRACTOR.js
index ca50a59..fe8472d 100644
--- a/data_structures/EXTRACTOR.js
+++ b/data_structures/EXTRACTOR.js
@@ -4,8 +4,8 @@ function EXTRACTOR () {
 	var ind = 1;
 
 	var model = scicos_model();
-	model.sim=list("extractor",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["extractor"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -15,4 +15,5 @@ function EXTRACTOR () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/EXTTRI.js b/data_structures/EXTTRI.js
index 4ccef96..5702134 100644
--- a/data_structures/EXTTRI.js
+++ b/data_structures/EXTTRI.js
@@ -7,7 +7,7 @@ function EXTTRI () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function EXTTRI () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Extract_Activation.js b/data_structures/Extract_Activation.js
index 399e3f7..ed98bf4 100644
--- a/data_structures/Extract_Activation.js
+++ b/data_structures/Extract_Activation.js
@@ -82,10 +82,11 @@ function Extract_Activation () {
 	clear blk lnk
 	model=scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar=scs_m_1;
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/FROM.js b/data_structures/FROM.js
index d08304b..5a5a591 100644
--- a/data_structures/FROM.js
+++ b/data_structures/FROM.js
@@ -3,7 +3,7 @@ function FROM () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["from"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -19,4 +19,5 @@ function FROM () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,gr_i);
 	this.x.graphics.id = new ScilabString(["From"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/FROMMO.js b/data_structures/FROMMO.js
index db224ee..e8573de 100644
--- a/data_structures/FROMMO.js
+++ b/data_structures/FROMMO.js
@@ -3,7 +3,7 @@ function FROMMO () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["frommo"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -23,4 +23,5 @@ function FROMMO () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,gr_i);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/FROMWSB.js b/data_structures/FROMWSB.js
index 90830e5..a610e91 100644
--- a/data_structures/FROMWSB.js
+++ b/data_structures/FROMWSB.js
@@ -1,14 +1,15 @@
 function FROMWSB () {
 
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000D-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=%t,theta=0,exprs=["V";"1";"1";"0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;-31;1;1;0],opar=list(),blocktype="d",firing=0,dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000D-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=%t,theta=0,exprs=["V";"1";"1";"0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;-31;1;1;0],opar=list(),blocktype="d",firing=0,dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([295.37067),yy: new ScilabDouble([255.86971),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=%t,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=%t,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([338.9421),yy: new ScilabDouble([281.584),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([3,1,1])}));
 
-	var model = [scicos_model(sim="csuper",in=[],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=[%f,%f],label="",nzcross=0,nmode=0,equations=list())];
+	var 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=[%f,%f],label="",nzcross=0,nmode=0,equations=list());
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([5,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Flowmeter.js b/data_structures/Flowmeter.js
index dc3f7de..b17778b 100644
--- a/data_structures/Flowmeter.js
+++ b/data_structures/Flowmeter.js
@@ -26,4 +26,5 @@ function Flowmeter () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GAINBLK.js b/data_structures/GAINBLK.js
index 4627818..c16da52 100644
--- a/data_structures/GAINBLK.js
+++ b/data_structures/GAINBLK.js
@@ -3,13 +3,13 @@ function GAINBLK () {
 
 	var gain = 1;
 
-	var in = -1],[out=-1;
+	var in1 = -1],[out=-1;
 
 	var in2 = -2],[out2=-2;
 
 	var model = scicos_model();
-	model.sim=list("gainblk",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["gainblk"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=out;
 	model.in2.push(new ScilabDouble([in2]));
 	model.out2.push(out2);
@@ -21,4 +21,5 @@ function GAINBLK () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GAINBLK_f.js b/data_structures/GAINBLK_f.js
index 0a51cbf..bb31112 100644
--- a/data_structures/GAINBLK_f.js
+++ b/data_structures/GAINBLK_f.js
@@ -3,11 +3,11 @@ function GAINBLK_f () {
 
 	var gain = 1;
 
-	var in = 1],[out=1;
+	var in1 = 1],[out=1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gain"]);
-	model.in=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=out;
 	model.rpar=new ScilabDouble([gain]);
 	model.blocktype = new ScilabString(["c"]);
@@ -17,4 +17,5 @@ function GAINBLK_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GAIN_f.js b/data_structures/GAIN_f.js
index 29ded41..0b78d54 100644
--- a/data_structures/GAIN_f.js
+++ b/data_structures/GAIN_f.js
@@ -1,18 +1,19 @@
 function GAIN_f () {
 
 
-	var gain = 1],[in=1],[out=1;
+	var gain = 1],[in1=1],[out=1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gain"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar=new ScilabDouble([gain]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(sci2exp(gain))],[strcat(sci2exp(in))],[strcat(sci2exp(out))]];
+	var exprs = [[strcat(sci2exp(gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GENERAL_f.js b/data_structures/GENERAL_f.js
index e23f1b1..1db91b0 100644
--- a/data_structures/GENERAL_f.js
+++ b/data_structures/GENERAL_f.js
@@ -3,22 +3,23 @@ function GENERAL_f () {
 
 	var rpar = [[0],[0],[0],[0]];
 
-	var in = 1;
+	var in1 = 1;
 
 	var out = 1;
 
 	var model = scicos_model();
-	model.sim=list("zcross",1);
-	model.nzcross=new ScilabDouble([in]);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["zcross"]),new ScilabDouble([1]));
+	model.nzcross=new ScilabDouble([in1]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.evtout=ones(out,1);
 	model.rpar = new ScilabDouble([0],[0],[0],[0]);
 	model.blocktype = new ScilabString(["z"]);
 	model.firing=-ones(out,1);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[strcat(sci2exp(in))],[strcat(sci2exp(out))]];
+	var exprs = [[strcat(sci2exp(in1))],[strcat(sci2exp(out))]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GENSIN_f.js b/data_structures/GENSIN_f.js
index 6a3cb04..13638df 100644
--- a/data_structures/GENSIN_f.js
+++ b/data_structures/GENSIN_f.js
@@ -5,7 +5,7 @@ function GENSIN_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gensin"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
 	model.outtyp = new ScilabDouble([1]);
@@ -13,8 +13,9 @@ function GENSIN_f () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,true]);
 
-	var exprs = [[rpar(1.toString())],[rpar(2.toString())],[rpar(3.toString())]];
+	var exprs = [[string(rpar(1))],[string(rpar(2))],[string(rpar(3))]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GENSQR_f.js b/data_structures/GENSQR_f.js
index 595e96b..e4d52e1 100644
--- a/data_structures/GENSQR_f.js
+++ b/data_structures/GENSQR_f.js
@@ -13,8 +13,9 @@ function GENSQR_f () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = Amplitude.toString();
+	var exprs = string(Amplitude);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GOTO.js b/data_structures/GOTO.js
index 21f625f..9c0c19b 100644
--- a/data_structures/GOTO.js
+++ b/data_structures/GOTO.js
@@ -3,7 +3,7 @@ function GOTO () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["goto"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([-1]);
 	model.out = new ScilabDouble();
@@ -19,4 +19,5 @@ function GOTO () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,gr_i);
 	this.x.graphics.id = new ScilabString(["Goto"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GOTOMO.js b/data_structures/GOTOMO.js
index 5b7d6e1..70a1907 100644
--- a/data_structures/GOTOMO.js
+++ b/data_structures/GOTOMO.js
@@ -3,7 +3,7 @@ function GOTOMO () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gotomo"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble();
 	model.out = new ScilabDouble();
@@ -23,4 +23,5 @@ function GOTOMO () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GotoTagVisibility.js b/data_structures/GotoTagVisibility.js
index 2318924..27c4d72 100644
--- a/data_structures/GotoTagVisibility.js
+++ b/data_structures/GotoTagVisibility.js
@@ -3,7 +3,7 @@ function GotoTagVisibility () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gototagvisibility"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.out = new ScilabDouble();
 	model.out2 = new ScilabDouble();
@@ -19,4 +19,5 @@ function GotoTagVisibility () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/GotoTagVisibilityMO.js b/data_structures/GotoTagVisibilityMO.js
index 125bb29..8ede428 100644
--- a/data_structures/GotoTagVisibilityMO.js
+++ b/data_structures/GotoTagVisibilityMO.js
@@ -3,7 +3,7 @@ function GotoTagVisibilityMO () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["gototagvisibilitymo"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.out = new ScilabDouble();
 	model.out2 = new ScilabDouble();
@@ -19,4 +19,5 @@ function GotoTagVisibilityMO () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Ground.js b/data_structures/Ground.js
index d3a0f12..53c0d1a 100644
--- a/data_structures/Ground.js
+++ b/data_structures/Ground.js
@@ -2,7 +2,7 @@ function Ground () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble();
 	model.sim = new ScilabString(["Ground"]);
 	model.blocktype = new ScilabString(["c"]);
@@ -16,7 +16,8 @@ function Ground () {
 	var exprs = "";
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([1,1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new GroundBlock(this.x)
 }
diff --git a/data_structures/Gyrator.js b/data_structures/Gyrator.js
index 24d6ae4..6e9b7a9 100644
--- a/data_structures/Gyrator.js
+++ b/data_structures/Gyrator.js
@@ -26,4 +26,5 @@ function Gyrator () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/HALT_f.js b/data_structures/HALT_f.js
index 578204a..7199f8c 100644
--- a/data_structures/HALT_f.js
+++ b/data_structures/HALT_f.js
@@ -11,8 +11,9 @@ function HALT_f () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = n.toString();
+	var exprs = string(n);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/HYSTHERESIS.js b/data_structures/HYSTHERESIS.js
index cf03644..22f72d0 100644
--- a/data_structures/HYSTHERESIS.js
+++ b/data_structures/HYSTHERESIS.js
@@ -1,7 +1,7 @@
 function HYSTHERESIS () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var ipar = [0];
 
@@ -10,8 +10,8 @@ function HYSTHERESIS () {
 	var rpar = [[1],[0],[1],[0]];
 
 	var model = scicos_model();
-	model.sim=list("hystheresis",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["hystheresis"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out = new ScilabDouble([1]);
 	model.rpar=new ScilabDouble([rpar]);
 	model.nzcross=new ScilabDouble([nzz]);
@@ -19,8 +19,9 @@ function HYSTHERESIS () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[rpar.toString()],[sign(nzz.toString())]];
+	var exprs = [[string(rpar)],[string(sign(nzz))]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/IFTHEL_f.js b/data_structures/IFTHEL_f.js
index 4076d94..5830a9d 100644
--- a/data_structures/IFTHEL_f.js
+++ b/data_structures/IFTHEL_f.js
@@ -2,8 +2,8 @@ function IFTHEL_f () {
 
 
 	var model = scicos_model();
-	model.sim=list("ifthel",-1);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["ifthel"]),new ScilabDouble([-1]));
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([-1]);
 	model.evtin = new ScilabDouble([1]);
@@ -16,6 +16,7 @@ function IFTHEL_f () {
 
 	var gr_i = [];
 
-	var exprs = [[model.in.toString()],[model.nmode.toString()]];
+	var exprs = [[string(model.in1)],[string(model.nmode)]];
 	this.x=new standard_define(new ScilabDouble([3,3]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INIMPL_f.js b/data_structures/INIMPL_f.js
index d333e4f..968ebb3 100644
--- a/data_structures/INIMPL_f.js
+++ b/data_structures/INIMPL_f.js
@@ -21,4 +21,5 @@ function INIMPL_f () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new ImplicitInBlock(this.x)
 }
diff --git a/data_structures/INTEGRAL_f.js b/data_structures/INTEGRAL_f.js
index 9e99491..70589f4 100644
--- a/data_structures/INTEGRAL_f.js
+++ b/data_structures/INTEGRAL_f.js
@@ -5,7 +5,7 @@ function INTEGRAL_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["integr"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.state=new ScilabDouble([x0]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function INTEGRAL_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INTEGRAL_m.js b/data_structures/INTEGRAL_m.js
index 7c3666c..1606b27 100644
--- a/data_structures/INTEGRAL_m.js
+++ b/data_structures/INTEGRAL_m.js
@@ -9,8 +9,8 @@ function INTEGRAL_m () {
 
 	var model = scicos_model();
 	model.state = new ScilabDouble([0]);
-	model.sim=list("integral_func",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["integral_func"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
@@ -18,8 +18,9 @@ function INTEGRAL_m () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,true]);
 
-	var exprs = [[0],[0],[0],[maxp],[minp].toString()];
+	var exprs = string([0],[0],[0],[maxp],[minp]);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INTMUL.js b/data_structures/INTMUL.js
index 8c55e33..b741d3e 100644
--- a/data_structures/INTMUL.js
+++ b/data_structures/INTMUL.js
@@ -4,8 +4,8 @@ function INTMUL () {
 	var sgn = 0;
 
 	var model = scicos_model();
-	model.sim=list("matmul_i32",4);
-	model.in = new ScilabDouble([-1],[-2]);
+	model.sim=list(new ScilabString(["matmul_i32"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-2]);
 	model.out = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2],[-3]);
 	model.out2 = new ScilabDouble([-3]);
@@ -20,4 +20,5 @@ function INTMUL () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INTRP2BLK_f.js b/data_structures/INTRP2BLK_f.js
index 983a799..a70bdec 100644
--- a/data_structures/INTRP2BLK_f.js
+++ b/data_structures/INTRP2BLK_f.js
@@ -8,8 +8,8 @@ function INTRP2BLK_f () {
 	var c = [[0,1],[1,2]];
 
 	var model = scicos_model();
-	model.sim=list("intrp2",1);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["intrp2"]),new ScilabDouble([1]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([a],[b],[...c]);
 	model.ipar = new ScilabDouble([2],[2]);
@@ -20,4 +20,5 @@ function INTRP2BLK_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INTRPLBLK_f.js b/data_structures/INTRPLBLK_f.js
index 5fc6776..4cfc3f4 100644
--- a/data_structures/INTRPLBLK_f.js
+++ b/data_structures/INTRPLBLK_f.js
@@ -7,7 +7,7 @@ function INTRPLBLK_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["intrpl"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([a],[b]);
 	model.blocktype = new ScilabString(["c"]);
@@ -17,4 +17,5 @@ function INTRPLBLK_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/INVBLK.js b/data_structures/INVBLK.js
index dcf1114..f99b5c7 100644
--- a/data_structures/INVBLK.js
+++ b/data_structures/INVBLK.js
@@ -1,12 +1,12 @@
 function INVBLK () {
 
 
-	var in = -1;
+	var in1 = -1;
 
 	var model = scicos_model();
-	model.sim=list("invblk4",4);
-	model.in=new ScilabDouble([in]);
-	model.out=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["invblk4"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
+	model.out=new ScilabDouble([in1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
@@ -14,4 +14,5 @@ function INVBLK () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/IN_f.js b/data_structures/IN_f.js
index fd098e3..8b39f0b 100644
--- a/data_structures/IN_f.js
+++ b/data_structures/IN_f.js
@@ -16,4 +16,5 @@ function IN_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
+	return new ExplicitInBlock(this.x)
 }
diff --git a/data_structures/ISELECT_m.js b/data_structures/ISELECT_m.js
index 070c0eb..63322de 100644
--- a/data_structures/ISELECT_m.js
+++ b/data_structures/ISELECT_m.js
@@ -6,11 +6,11 @@ function ISELECT_m () {
 	var nout = 2;
 
 	var model = scicos_model();
-	model.sim=list("selector_m",4);
+	model.sim=list(new ScilabString(["selector_m"]),new ScilabDouble([4]));
 	model.out = new ScilabDouble([-1],[-1]);
 	model.out2 = new ScilabDouble([-2],[-2]);
 	model.outtyp = new ScilabDouble([1]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble();
@@ -27,4 +27,5 @@ function ISELECT_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/IdealTransformer.js b/data_structures/IdealTransformer.js
index bd23ce5..54d38f7 100644
--- a/data_structures/IdealTransformer.js
+++ b/data_structures/IdealTransformer.js
@@ -26,4 +26,5 @@ function IdealTransformer () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Inductor.js b/data_structures/Inductor.js
index 7bcca77..470b8db 100644
--- a/data_structures/Inductor.js
+++ b/data_structures/Inductor.js
@@ -2,7 +2,7 @@ function Inductor () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 
 	var L = 1.d-5;
@@ -15,13 +15,14 @@ function Inductor () {
 	mo.model = new ScilabString(["Inductor"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list("L",list(L));
+	mo.parameters=list(new ScilabString(["L"]),list(L));
 	model.equations=mo;
 
-	var exprs = L.toString();
+	var exprs = string(L);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,0.9]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,0.9],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/JKFLIPFLOP.js b/data_structures/JKFLIPFLOP.js
index 7bc7731..7de61c4 100644
--- a/data_structures/JKFLIPFLOP.js
+++ b/data_structures/JKFLIPFLOP.js
@@ -1,42 +1,42 @@
 function JKFLIPFLOP () {
 
 
-	var scs_m = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m.objs.push(scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=%f,theta=0,exprs=["int8(0)";"1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m.objs.push(scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=%f,theta=0,exprs=["int8(0)";"1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(new ScilabInteger([0])),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=%t,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=1,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=3,pout=[],pein=[],peout=[7;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=%t,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=1,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=%t,theta=0,exprs=["0";"0"],pin=3,pout=[],pein=[],peout=[7;0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([357.15774),yy: new ScilabDouble([277.1131),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([2,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([260.01488),yy: new ScilabDouble([277.1131),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([4,1,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=7,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([408.28869),yy: new ScilabDouble([241.39881),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([6,1,1])}));
-	scs_m.objs.push(scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=%t,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=%t,theta=0,exprs=["[0;1;1;1;0;0;1;0]";"0"],pin=[5;16;18],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("logic",4),in=[1;1;1],in2=[1;1;1],intyp=[5;5;5],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0;1;1;1;0;0;1;0])),blocktype="c",firing=%f,dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=%t,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=%t,theta=0,exprs=["[0;1;1;1;0;0;1;0]";"0"],pin=[5;16;18],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[1;1;1],in2=[1;1;1],intyp=[5;5;5],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(new ScilabInteger([[0;1;1;1;0;0;1;0]])),blocktype="c",firing=%f,dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([351.36756),yy: new ScilabDouble([222.52782),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([10,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([291.39818),yy: new ScilabDouble([281.584),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=11,pout=[7;20],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=11,pout=[7;20],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([368.82793),yy: new ScilabDouble([243.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([6,1,0]),to: new ScilabDouble([1,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([322.52452),yy: new ScilabDouble([317.8346),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[377.63217,159.25363],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=12,pout=22,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793;223.06473],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=4,pout=[11;12],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[377.63217,159.25363],sz=[60,40],flip=%t,theta=0,exprs=["1";"5";"5";"0"],pin=12,pout=22,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5;0],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793;223.06473],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=4,pout=[11;12],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([368.82793),yy: new ScilabDouble([223.06473),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([10,1,0]),to: new ScilabDouble([6,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([368.82793),yy: new ScilabDouble([223.06473),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([10,2,0]),to: new ScilabDouble([9,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[243.95309,333.54888],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=14,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[243.95309,333.54888],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=14,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([263.95309),yy: new ScilabDouble([343.54888),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([13,1,0]),to: new ScilabDouble([2,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,212.52782],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=16,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,212.52782],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=16,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([274.2247),yy: new ScilabDouble([222.52782),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([15,1,0]),to: new ScilabDouble([3,2,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,202.52782],sz=[20,20],flip=%t,theta=0,exprs="3",pin=[],pout=18,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,202.52782],sz=[20,20],flip=%t,theta=0,exprs="3",pin=[],pout=18,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([274.2247),yy: new ScilabDouble([212.52782),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([17,1,0]),to: new ScilabDouble([3,3,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[388.82793,233.45067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=20,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[388.82793,233.45067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=20,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([368.82793),yy: new ScilabDouble([243.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([6,2,0]),to: new ScilabDouble([19,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=%t,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=%t,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([446.2036),yy: new ScilabDouble([179.25363),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([9,1,0]),to: new ScilabDouble([21,1,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1],[1],[1]);
+	model.in1 = new ScilabDouble([1],[1],[1]);
 	model.in2 = new ScilabDouble([1],[1],[1]);
 	model.out = new ScilabDouble([1],[1]);
 	model.out2 = new ScilabDouble([1],[1]);
@@ -49,4 +49,5 @@ function JKFLIPFLOP () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/LOGBLK_f.js b/data_structures/LOGBLK_f.js
index e8f043f..728dc8a 100644
--- a/data_structures/LOGBLK_f.js
+++ b/data_structures/LOGBLK_f.js
@@ -1,13 +1,13 @@
 function LOGBLK_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var a = %e;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["logblk"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.rpar=new ScilabBoolean([a]);
 	model.blocktype = new ScilabString(["c"]);
@@ -17,4 +17,5 @@ function LOGBLK_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/LOGIC.js b/data_structures/LOGIC.js
index 6565242..453ecae 100644
--- a/data_structures/LOGIC.js
+++ b/data_structures/LOGIC.js
@@ -4,15 +4,15 @@ function LOGIC () {
 	var mat = [[0],[0],[0],[1]];
 
 	var model = scicos_model();
-	model.sim=list("logic",4);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["logic"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 	model.out2 = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([5,5]);
 	model.outtyp = new ScilabDouble([5]);
-	model.opar=list(int8(mat));
+	model.opar=list(new ScilabInteger([mat]));
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabBoolean([false]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -21,4 +21,5 @@ function LOGIC () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/LOGICAL_OP.js b/data_structures/LOGICAL_OP.js
index cbaa1a1..5c50e07 100644
--- a/data_structures/LOGICAL_OP.js
+++ b/data_structures/LOGICAL_OP.js
@@ -1,22 +1,23 @@
 function LOGICAL_OP () {
 
 
-	var in = [[-1],[-1]];
+	var in1 = [[-1],[-1]];
 
 	var ipar = [0];
 
 	var nin = 2;
 
 	var model = scicos_model();
-	model.sim=list("logicalop",4);
-	model.in=in;
+	model.sim=list(new ScilabString(["logicalop"]),new ScilabDouble([4]));
+	model.in1.push(in1);
 	model.out = new ScilabDouble([-1]);
 	model.ipar=new ScilabDouble([ipar]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[nin.toString()],[ipar.toString()]];
+	var exprs = [[string(nin)],[string(ipar)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/LOOKUP_f.js b/data_structures/LOOKUP_f.js
index b6a242f..b31e361 100644
--- a/data_structures/LOOKUP_f.js
+++ b/data_structures/LOOKUP_f.js
@@ -3,7 +3,7 @@ function LOOKUP_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["lookup"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]);
 	model.blocktype = new ScilabString(["c"]);
@@ -11,4 +11,5 @@ function LOOKUP_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATBKSL.js b/data_structures/MATBKSL.js
index 0f40803..94b0ede 100644
--- a/data_structures/MATBKSL.js
+++ b/data_structures/MATBKSL.js
@@ -7,7 +7,7 @@ function MATBKSL () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.in2 = new ScilabDouble([-2],[-3]);
 	model.intyp = new ScilabDouble([1,1]);
 	model.out = new ScilabDouble([-2]);
@@ -27,4 +27,5 @@ function MATBKSL () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATCATH.js b/data_structures/MATCATH.js
index 6f5d6e3..07beb4e 100644
--- a/data_structures/MATCATH.js
+++ b/data_structures/MATCATH.js
@@ -7,7 +7,7 @@ function MATCATH () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.in2 = new ScilabDouble([-2],[-3]);
 	model.intyp = new ScilabDouble([1,1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATCATH () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATCATV.js b/data_structures/MATCATV.js
index f8f1bf8..4fd6959 100644
--- a/data_structures/MATCATV.js
+++ b/data_structures/MATCATV.js
@@ -10,7 +10,7 @@ function MATCATV () {
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
 	model.in2 = new ScilabDouble([-1],[-1]);
-	model.in = new ScilabDouble([-2],[-3]);
+	model.in1 = new ScilabDouble([-2],[-3]);
 	model.intyp = new ScilabDouble([-1,-1]);
 	model.out = new ScilabDouble([0]);
 	model.out2 = new ScilabDouble([-1]);
@@ -29,4 +29,5 @@ function MATCATV () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATDET.js b/data_structures/MATDET.js
index d83a472..8912194 100644
--- a/data_structures/MATDET.js
+++ b/data_structures/MATDET.js
@@ -7,7 +7,7 @@ function MATDET () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -27,4 +27,5 @@ function MATDET () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATDIAG.js b/data_structures/MATDIAG.js
index 9285d04..0bdf382 100644
--- a/data_structures/MATDIAG.js
+++ b/data_structures/MATDIAG.js
@@ -7,7 +7,7 @@ function MATDIAG () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATDIAG () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATDIV.js b/data_structures/MATDIV.js
index 3689f6e..73f1f36 100644
--- a/data_structures/MATDIV.js
+++ b/data_structures/MATDIV.js
@@ -7,7 +7,7 @@ function MATDIV () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1],[-2]);
+	model.in1 = new ScilabDouble([-1],[-2]);
 	model.in2 = new ScilabDouble([-3],[-3]);
 	model.intyp = new ScilabDouble([1,1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATDIV () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATEIG.js b/data_structures/MATEIG.js
index 96762a6..c23df30 100644
--- a/data_structures/MATEIG.js
+++ b/data_structures/MATEIG.js
@@ -7,7 +7,7 @@ function MATEIG () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATEIG () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATEXPM.js b/data_structures/MATEXPM.js
index 92effa6..70734bd 100644
--- a/data_structures/MATEXPM.js
+++ b/data_structures/MATEXPM.js
@@ -7,7 +7,7 @@ function MATEXPM () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATEXPM () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATINV.js b/data_structures/MATINV.js
index 50d23e4..8b45697 100644
--- a/data_structures/MATINV.js
+++ b/data_structures/MATINV.js
@@ -7,7 +7,7 @@ function MATINV () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATINV () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATLU.js b/data_structures/MATLU.js
index ca10a72..6cc94e6 100644
--- a/data_structures/MATLU.js
+++ b/data_structures/MATLU.js
@@ -7,7 +7,7 @@ function MATLU () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1],[-1]);
@@ -27,4 +27,5 @@ function MATLU () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATMAGPHI.js b/data_structures/MATMAGPHI.js
index 7af7bac..c13d1dc 100644
--- a/data_structures/MATMAGPHI.js
+++ b/data_structures/MATMAGPHI.js
@@ -7,7 +7,7 @@ function MATMAGPHI () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([2]);
 	model.out = new ScilabDouble([-1],[-1]);
@@ -27,4 +27,5 @@ function MATMAGPHI () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATMUL.js b/data_structures/MATMUL.js
index 1891c6e..42af695 100644
--- a/data_structures/MATMUL.js
+++ b/data_structures/MATMUL.js
@@ -2,8 +2,8 @@ function MATMUL () {
 
 
 	var model = scicos_model();
-	model.sim=list("matmul_m",4);
-	model.in = new ScilabDouble([-1],[-2]);
+	model.sim=list(new ScilabString(["matmul_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-2]);
 	model.in2 = new ScilabDouble([-2],[-3]);
 	model.out = new ScilabDouble([-1]);
 	model.out2 = new ScilabDouble([-3]);
@@ -14,4 +14,5 @@ function MATMUL () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATPINV.js b/data_structures/MATPINV.js
index 136f117..27baace 100644
--- a/data_structures/MATPINV.js
+++ b/data_structures/MATPINV.js
@@ -7,7 +7,7 @@ function MATPINV () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-2]);
@@ -27,4 +27,5 @@ function MATPINV () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATRESH.js b/data_structures/MATRESH.js
index ca557a7..53b1871 100644
--- a/data_structures/MATRESH.js
+++ b/data_structures/MATRESH.js
@@ -7,7 +7,7 @@ function MATRESH () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATRESH () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATSING.js b/data_structures/MATSING.js
index 0c28840..7b1f072 100644
--- a/data_structures/MATSING.js
+++ b/data_structures/MATSING.js
@@ -7,7 +7,7 @@ function MATSING () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATSING () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATSUM.js b/data_structures/MATSUM.js
index 2f06343..43f7b3b 100644
--- a/data_structures/MATSUM.js
+++ b/data_structures/MATSUM.js
@@ -7,7 +7,7 @@ function MATSUM () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -27,4 +27,5 @@ function MATSUM () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATTRAN.js b/data_structures/MATTRAN.js
index e68f6a3..a3a0493 100644
--- a/data_structures/MATTRAN.js
+++ b/data_structures/MATTRAN.js
@@ -2,8 +2,8 @@ function MATTRAN () {
 
 
 	var model = scicos_model();
-	model.sim=list("mattran_m",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["mattran_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.out = new ScilabDouble([-2]);
 	model.out2 = new ScilabDouble([-1]);
@@ -13,4 +13,5 @@ function MATTRAN () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATZCONJ.js b/data_structures/MATZCONJ.js
index b2bdfe6..efb04cb 100644
--- a/data_structures/MATZCONJ.js
+++ b/data_structures/MATZCONJ.js
@@ -7,7 +7,7 @@ function MATZCONJ () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([2]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function MATZCONJ () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MATZREIM.js b/data_structures/MATZREIM.js
index 7e01449..327d303 100644
--- a/data_structures/MATZREIM.js
+++ b/data_structures/MATZREIM.js
@@ -7,7 +7,7 @@ function MATZREIM () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([2]);
 	model.out = new ScilabDouble([-1],[-1]);
@@ -27,4 +27,5 @@ function MATZREIM () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MAXMIN.js b/data_structures/MAXMIN.js
index 6b19a1c..903a053 100644
--- a/data_structures/MAXMIN.js
+++ b/data_structures/MAXMIN.js
@@ -2,16 +2,17 @@ function MAXMIN () {
 
 
 	var model = scicos_model();
-	model.sim=list("minmax",4);
+	model.sim=list(new ScilabString(["minmax"]),new ScilabDouble([4]));
 	model.out = new ScilabDouble([1]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 	model.ipar = new ScilabDouble([0]);
 
-	var exprs = [[2,1,1]'.toString()];
+	var exprs = [string([2,1,1]')];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
 	this.x.graphics.style = new ScilabString(["MAXMIN;displayedLabel=MAX"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MAX_f.js b/data_structures/MAX_f.js
index 8519732..3623dc1 100644
--- a/data_structures/MAX_f.js
+++ b/data_structures/MAX_f.js
@@ -1,11 +1,11 @@
 function MAX_f () {
 
 
-	var in = -1;
+	var in1 = -1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["maxblk"]);
-	model.in=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.out = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([0],[0]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function MAX_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MBLOCK.js b/data_structures/MBLOCK.js
index 30a963b..ce63569 100644
--- a/data_structures/MBLOCK.js
+++ b/data_structures/MBLOCK.js
@@ -1,7 +1,7 @@
 function MBLOCK () {
 
 
-	var in = ["u1"];
+	var in1 = ["u1"];
 
 	var intype = ["I"];
 
@@ -17,7 +17,7 @@ function MBLOCK () {
 
 	var nameF = "generic";
 
-	var exprs = [...colon_operator(tlist,["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(...in),sci2exp(...intype),sci2exp(...out),sci2exp(...outtype),sci2exp(...param),list(0.1.toString(),.0001.toString()),sci2exp(pprop(,)),nameF,[])];
+	var exprs = ...colon_operator(tlist,["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(...in1),sci2exp(...intype),sci2exp(...out),sci2exp(...outtype),sci2exp(...param),list(string(0.1),string(.0001)),sci2exp(pprop(,)),nameF,[]);
 
 	var model = scicos_model();
 	model.blocktype = new ScilabString(["c"]);
@@ -26,4 +26,5 @@ function MBLOCK () {
 
 	var for i = 1:lstsize(paramv);
 	model.rpar = new ScilabDouble([model.rpar],[paramv(i)(:)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MCLOCK_f.js b/data_structures/MCLOCK_f.js
index ee3eb49..0a94924 100644
--- a/data_structures/MCLOCK_f.js
+++ b/data_structures/MCLOCK_f.js
@@ -5,7 +5,7 @@ function MCLOCK_f () {
 
 	var dt = 0.1;
 
-	var exprs = [[dt.toString()],[nn.toString()]];
+	var exprs = [[string(dt)],[string(nn)]];
 
 	var mfclck = MFCLCK_f("define");
 	mfclck.graphics.orig = new ScilabDouble([334,199]);
@@ -77,4 +77,5 @@ function MCLOCK_f () {
 	this.x.model.blocktype = new ScilabString(["h"]);
 	this.x.model.rpar=diagram;
 	this.x.graphics.peout = new ScilabDouble([0],[0]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MFCLCK_f.js b/data_structures/MFCLCK_f.js
index 7e314e3..e7124f9 100644
--- a/data_structures/MFCLCK_f.js
+++ b/data_structures/MFCLCK_f.js
@@ -16,8 +16,9 @@ function MFCLCK_f () {
 	model.firing = new ScilabDouble([-1,0]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[dt.toString()],[nn.toString()]];
+	var exprs = [[string(dt)],[string(nn)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MIN_f.js b/data_structures/MIN_f.js
index 3055932..c71bfb9 100644
--- a/data_structures/MIN_f.js
+++ b/data_structures/MIN_f.js
@@ -1,18 +1,19 @@
 function MIN_f () {
 
 
-	var in = -1;
+	var in1 = -1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["minblk"]);
-	model.in=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.out = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([0],[0]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = sci2exp(in);
+	var exprs = sci2exp(in1);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MUX.js b/data_structures/MUX.js
index cbba6c7..5481f69 100644
--- a/data_structures/MUX.js
+++ b/data_structures/MUX.js
@@ -1,18 +1,19 @@
 function MUX () {
 
 
-	var in = 2;
+	var in1 = 2;
 
 	var model = scicos_model();
-	model.sim=list("multiplex",4);
-	model.in=-...transpose([1:in]);
+	model.sim=list(new ScilabString(["multiplex"]),new ScilabDouble([4]));
+	model.in1.push(-...transpose([1:in1]));
 	model.out = new ScilabDouble([0]);
-	model.ipar=new ScilabDouble([in]);
+	model.ipar=new ScilabDouble([in1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = in.toString();
+	var exprs = string(in1);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/MUX_f.js b/data_structures/MUX_f.js
index 533ce9b..05e2343 100644
--- a/data_structures/MUX_f.js
+++ b/data_structures/MUX_f.js
@@ -1,18 +1,19 @@
 function MUX_f () {
 
 
-	var in = 2;
+	var in1 = 2;
 
 	var model = scicos_model();
-	model.sim=list("mux",1);
-	model.in=-...transpose([1:in]);
+	model.sim=list(new ScilabString(["mux"]),new ScilabDouble([1]));
+	model.in1.push(-...transpose([1:in1]));
 	model.out = new ScilabDouble([0]);
-	model.ipar=new ScilabDouble([in]);
+	model.ipar=new ScilabDouble([in1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = in.toString();
+	var exprs = string(in1);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([0.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/M_SWITCH.js b/data_structures/M_SWITCH.js
index 049d8dc..e53c664 100644
--- a/data_structures/M_SWITCH.js
+++ b/data_structures/M_SWITCH.js
@@ -1,22 +1,23 @@
 function M_SWITCH () {
 
 
-	var in = [[1],[-1],[-1]];
+	var in1 = [[1],[-1],[-1]];
 
 	var ipar = [[1],[3]];
 
 	var nin = 2;
 
 	var model = scicos_model();
-	model.sim=list("mswitch",4);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["mswitch"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out = new ScilabDouble([-1]);
 	model.ipar=new ScilabDouble([ipar]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[nin.toString()],[ipar.toString()]];
+	var exprs = [[string(nin)],[string(ipar)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/M_freq.js b/data_structures/M_freq.js
index 1e2e8e4..0ab9467 100644
--- a/data_structures/M_freq.js
+++ b/data_structures/M_freq.js
@@ -2,11 +2,11 @@ function M_freq () {
 
 
 	var model = scicos_model();
-	model.sim=list("m_frequ",4);
+	model.sim=list(new ScilabString(["m_frequ"]),new ScilabDouble([4]));
 	model.evtout = new ScilabDouble([1],[1],[1]);
 	model.evtin = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble();
-	model.opar=list([1,1,0],[1,1,1],[1,3,2],1,0,0);
+	model.opar=list(new ScilabDouble([1),new ScilabDouble([1]),new ScilabDouble([0]]),new ScilabDouble([1),new ScilabDouble([1]),new ScilabDouble([1]]),new ScilabDouble([1),new ScilabDouble([3]),new ScilabDouble([2]]),new ScilabDouble([1]),new ScilabDouble([0]),new ScilabDouble([0]));
 	model.blocktype = new ScilabString(["d"]);
 	model.firing = new ScilabDouble([0,-1,-1]);
 	model.dep_ut = new ScilabBoolean([false,false]);
@@ -15,4 +15,5 @@ function M_freq () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Modulo_Count.js b/data_structures/Modulo_Count.js
index fc71f23..62db6ad 100644
--- a/data_structures/Modulo_Count.js
+++ b/data_structures/Modulo_Count.js
@@ -6,7 +6,7 @@ function Modulo_Count () {
 	var base = 3;
 
 	var model = scicos_model();
-	model.sim=list("modulo_count",4);
+	model.sim=list(new ScilabString(["modulo_count"]),new ScilabDouble([4]));
 	model.evtin = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.dstate=new ScilabDouble([ini_c]);
@@ -14,8 +14,9 @@ function Modulo_Count () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[ini_c.toString()],[base.toString()]];
+	var exprs = [[string(ini_c)],[string(base)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/NEGTOPOS_f.js b/data_structures/NEGTOPOS_f.js
index 3093461..e0e40d4 100644
--- a/data_structures/NEGTOPOS_f.js
+++ b/data_structures/NEGTOPOS_f.js
@@ -2,9 +2,9 @@ function NEGTOPOS_f () {
 
 
 	var model = scicos_model();
-	model.sim=list("zcross",1);
+	model.sim=list(new ScilabString(["zcross"]),new ScilabDouble([1]));
 	model.nzcross = new ScilabDouble([1]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([-1],[-1],[0],[-1]);
 	model.blocktype = new ScilabString(["z"]);
@@ -13,4 +13,5 @@ function NEGTOPOS_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/NMOS.js b/data_structures/NMOS.js
index 8e5c23e..350c46c 100644
--- a/data_structures/NMOS.js
+++ b/data_structures/NMOS.js
@@ -28,15 +28,16 @@ function NMOS () {
 	mo.model = new ScilabString(["NMOS"]);
 	mo.outputs = new ScilabString(["D";"B";"S"]);
 	mo.inputs = new ScilabString(["G"]);
-	mo.parameters=list(["W";"L";"Beta";"Vt";"K2";"K5";"dW";"dL";"RDS"],[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]);
+	mo.parameters=list(new ScilabString(["W";"L";"Beta";"Vt";"K2";"K5";"dW";"dL";"RDS"]),[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[W.toString()],[L.toString()],[Beta.toString()],[Vt.toString()],[K2.toString()],[K5.toString()],[dW.toString()],[dL.toString()],[RDS.toString()]];
+	var exprs = [[string(W)],[string(L)],[string(Beta)],[string(Vt)],[string(K2)],[string(K5)],[string(dW)],[string(dL)],[string(RDS)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I";"I";"I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/NPN.js b/data_structures/NPN.js
index 53df5cf..843e410 100644
--- a/data_structures/NPN.js
+++ b/data_structures/NPN.js
@@ -26,4 +26,5 @@ function NPN () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/NRMSOM_f.js b/data_structures/NRMSOM_f.js
index 37c8e3c..f13e210 100644
--- a/data_structures/NRMSOM_f.js
+++ b/data_structures/NRMSOM_f.js
@@ -1,19 +1,20 @@
 function NRMSOM_f () {
 
 
-	var in = [[-1],[-1]];
+	var in1 = [[-1],[-1]];
 
 	var nin = 2;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["junk"]);
-	model.in=in;
+	model.in1.push(in1);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [nin.toString()];
+	var exprs = [string(nin)];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([.2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/OUTIMPL_f.js b/data_structures/OUTIMPL_f.js
index 7b2012a..5d4ce64 100644
--- a/data_structures/OUTIMPL_f.js
+++ b/data_structures/OUTIMPL_f.js
@@ -2,7 +2,7 @@ function OUTIMPL_f () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([1]);
 
 	var prt = 1;
@@ -21,4 +21,5 @@ function OUTIMPL_f () {
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
+	return new ImplicitOutBlock(this.x)
 }
diff --git a/data_structures/OUT_f.js b/data_structures/OUT_f.js
index 77e8f89..56eaea2 100644
--- a/data_structures/OUT_f.js
+++ b/data_structures/OUT_f.js
@@ -7,15 +7,16 @@ function OUT_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["output"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([-1]);
 	model.ipar=new ScilabDouble([prt]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = prt.toString();
+	var exprs = string(prt);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
+	return new ExplicitOutBlock(this.x)
 }
diff --git a/data_structures/OpAmp.js b/data_structures/OpAmp.js
index 202d590..120a0f6 100644
--- a/data_structures/OpAmp.js
+++ b/data_structures/OpAmp.js
@@ -16,14 +16,15 @@ function OpAmp () {
 	mo.outputs = new ScilabString(["out"]);
 	mo.parameters=list(S,Z);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 	model.rpar=Z;
 
-	var exprs = Z.toString();
+	var exprs = string(Z);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,5]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I";"I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PDE.js b/data_structures/PDE.js
index e90beb5..263c715 100644
--- a/data_structures/PDE.js
+++ b/data_structures/PDE.js
@@ -3,8 +3,8 @@ function PDE () {
 
 	var model = scicos_model();
 	model.state=zeros(10,1);
-	model.sim=list("PDE",0);
-	model.in = new ScilabDouble([1],[1],[1],[1],[1]);
+	model.sim=list(new ScilabString(["PDE"]),new ScilabDouble([0]));
+	model.in1 = new ScilabDouble([1],[1],[1],[1],[1]);
 	model.out = new ScilabDouble([10],[0]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([false,true]);
@@ -15,4 +15,5 @@ function PDE () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,3]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PID.js b/data_structures/PID.js
index 7b21fff..e3dd59e 100644
--- a/data_structures/PID.js
+++ b/data_structures/PID.js
@@ -1,32 +1,32 @@
 function PID () {
 
 
-	var scs_m = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m.objs.push(scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=%t,theta=0,exprs=["0";"0";"0";"1";"-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=%t,theta=0,exprs=["1";"[1;1;1]"],pin=[10;9;11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in=[-1;-1;-1],in2=[-2;-2;-2],intyp=[1;1;1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;1;1],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=%t,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=%t,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=%t,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=%t,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],tol=[0.0001,0.000001,1.000E-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m.objs.push(scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=%t,theta=0,exprs=["0";"0";"0";"1";"-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=%t,theta=0,exprs=["1";"[1;1;1]"],pin=[10;9;11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1;-1;-1],in2=[-2;-2;-2],intyp=[1;1;1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1;1;1],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=%t,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=%t,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=%t,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=%t,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([303.80876),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([5,1,0]),to: new ScilabDouble([1,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([303.80876),yy: new ScilabDouble([155.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([6,1,0]),to: new ScilabDouble([4,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([366.87543),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([2,2,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([369.80876),yy: new ScilabDouble([255.91733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([2,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([367.60876),yy: new ScilabDouble([155.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([4,1,0]),to: new ScilabDouble([2,3,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704;203.11733],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=16,pout=[13;14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704;203.11733],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=16,pout=[13;14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([234.704),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([12,1,0]),to: new ScilabDouble([5,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([234.704),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([12,2,0]),to: new ScilabDouble([6,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067;203.11733],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=21,pout=[16;17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067;203.11733],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=21,pout=[16;17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([233.97067),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([15,1,0]),to: new ScilabDouble([12,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([233.97067),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([15,2,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([436.5421),yy: new ScilabDouble([202.85067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([18,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([213.97067),yy: new ScilabDouble([203.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([20,1,0]),to: new ScilabDouble([15,1,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.out = new ScilabDouble([-1]);
 	model.out2 = new ScilabDouble([-2]);
@@ -39,4 +39,5 @@ function PID () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PMOS.js b/data_structures/PMOS.js
index 1fdb28a..5a9ff67 100644
--- a/data_structures/PMOS.js
+++ b/data_structures/PMOS.js
@@ -28,15 +28,16 @@ function PMOS () {
 	mo.model = new ScilabString(["PMOS"]);
 	mo.outputs = new ScilabString(["D";"B";"S"]);
 	mo.inputs = new ScilabString(["G"]);
-	mo.parameters=list(["W";"L";"Beta";"Vt";"K2";"K5";"dW";"dL";"RDS"],[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]);
+	mo.parameters=list(new ScilabString(["W";"L";"Beta";"Vt";"K2";"K5";"dW";"dL";"RDS"]),[W],[L],[Beta],[Vt],[K2],[K5],[dW],[dL],[RDS]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[W.toString()],[L.toString()],[Beta.toString()],[Vt.toString()],[K2.toString()],[K5.toString()],[dW.toString()],[dL.toString()],[RDS.toString()]];
+	var exprs = [[string(W)],[string(L)],[string(Beta)],[string(Vt)],[string(K2)],[string(K5)],[string(dW)],[string(dL)],[string(RDS)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I";"I";"I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PNP.js b/data_structures/PNP.js
index 479626c..b9108e6 100644
--- a/data_structures/PNP.js
+++ b/data_structures/PNP.js
@@ -26,4 +26,5 @@ function PNP () {
 	var if P(i,3) = =1, then;
 	Typein = new ScilabDouble([Typein;,"E"]);
 	MI = new ScilabDouble([MI],[PortName(i)]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/POSTONEG_f.js b/data_structures/POSTONEG_f.js
index 2d107c8..53c941b 100644
--- a/data_structures/POSTONEG_f.js
+++ b/data_structures/POSTONEG_f.js
@@ -4,9 +4,9 @@ function POSTONEG_f () {
 	var rpar = [[-1],[-1],[-1],[0]];
 
 	var model = scicos_model();
-	model.sim=list("zcross",1);
+	model.sim=list(new ScilabString(["zcross"]),new ScilabDouble([1]));
 	model.nzcross = new ScilabDouble([1]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([-1],[-1],[-1],[0]);
 	model.blocktype = new ScilabString(["z"]);
@@ -15,4 +15,5 @@ function POSTONEG_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/POWBLK_f.js b/data_structures/POWBLK_f.js
index 49e46a4..fe907b7 100644
--- a/data_structures/POWBLK_f.js
+++ b/data_structures/POWBLK_f.js
@@ -1,20 +1,21 @@
 function POWBLK_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var a = 1.5;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["powblk"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.rpar=new ScilabDouble([a]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = a.toString();
+	var exprs = string(a);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PRODUCT.js b/data_structures/PRODUCT.js
index 209fe15..3fc6a08 100644
--- a/data_structures/PRODUCT.js
+++ b/data_structures/PRODUCT.js
@@ -4,8 +4,8 @@ function PRODUCT () {
 	var sgn = [[1],[-1]];
 
 	var model = scicos_model();
-	model.sim=list("product",4);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["product"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.ipar=new ScilabDouble([sgn]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function PRODUCT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,,exprs,gr_i);
+	return new Product(this.x)
 }
diff --git a/data_structures/PROD_f.js b/data_structures/PROD_f.js
index a169dc1..5e1f69b 100644
--- a/data_structures/PROD_f.js
+++ b/data_structures/PROD_f.js
@@ -2,10 +2,11 @@ function PROD_f () {
 
 
 	var model = scicos_model();
-	model.sim=list("prod",2);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["prod"]),new ScilabDouble([2]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 	this.x=new standard_define(new ScilabDouble([1,1]),model,[],[]);
+	return new RoundBlock(this.x)
 }
diff --git a/data_structures/PULSE_SC.js b/data_structures/PULSE_SC.js
index 68c326b..ba73528 100644
--- a/data_structures/PULSE_SC.js
+++ b/data_structures/PULSE_SC.js
@@ -1,25 +1,25 @@
 function PULSE_SC () {
 
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-162.7581,435.54369,67.607292,416.67644,827,479,0,15,827,480,715,167,1.4],Title=["SuperBlock","/home/fady/Scicos_examples/"],tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],tf=10,context=["E2=E+W/100*F"];
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-162.7581,435.54369,67.607292,416.67644,827,479,0,15,827,480,715,167,1.4],Title=["SuperBlock","/home/fady/Scicos_examples/"],tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],tf=10,context=["E2=E+W/100*F";
 	"if (W<0 | W>100) then error(''Width must be between 0 and 100'');end";
 
-	var "if (E2 > = [F),then,error,(''Offset,must,be,lower,than,(frequency*(1-Width/100))'');,end"],void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[30.801202,158.91733],sz=[40,40],flip=%t,theta=0,exprs="A",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in=[],in2=[],intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(1),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="Ground_g",graphics=scicos_graphics(orig=[31.534535,215.384],sz=[40,40],flip=%t,theta=0,exprs=[],pin=[],pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in=[],in2=[],intyp=1,out=1,out2=1,outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(0),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[106.00652,186.09381],sz=[40,40],flip=%t,theta=0,exprs=["-1";"2";"1"],pin=[4;5],pout=11,pein=[9;8],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in=[-1;-1],in2=[-2;-2],intyp=[-1;-1],out=-1,out2=-2,outtyp=-1,evtin=[1;1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var "if (E2 > = F),then,error,(''Offset,must,be,lower,than,(frequency*(1-Width/100))'');,end"],void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[30.801202,158.91733],sz=[40,40],flip=%t,theta=0,exprs="A",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(1),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="Ground_g",graphics=scicos_graphics(orig=[31.534535,215.384],sz=[40,40],flip=%t,theta=0,exprs=[],pin=[],pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(0),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[106.00652,186.09381],sz=[40,40],flip=%t,theta=0,exprs=["-1";"2";"1"],pin=[4;5],pout=11,pein=[9;8],peout=[],gr_i=[],id="",in_implicit=["E";"E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in1=[-1;-1],in2=[-2;-2],intyp=[-1;-1],out=-1,out2=-2,outtyp=-1,evtin=[1;1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([80.105964),yy: new ScilabDouble([235.384),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([3,1,1])}));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([79.372631),yy: new ScilabDouble([178.91733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([3,2,1])}));
-	scs_m_1.objs.push(scicos_block(gui="SampleCLK",graphics=scicos_graphics(orig=[82.349744,274.21741],sz=[60,40],flip=%t,theta=0,exprs=["F";"E2"],pin=[],pout=[],pein=[],peout=9,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sampleclk",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[1;0.4],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
-	scs_m_1.objs.push(scicos_block(gui="SampleCLK",graphics=scicos_graphics(orig=[160.48879,274.21741],sz=[60,40],flip=%t,theta=0,exprs=["F";"E"],pin=[],pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sampleclk",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[1;0.1],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="SampleCLK",graphics=scicos_graphics(orig=[82.349744,274.21741],sz=[60,40],flip=%t,theta=0,exprs=["F";"E2"],pin=[],pout=[],pein=[],peout=9,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;0.4],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="SampleCLK",graphics=scicos_graphics(orig=[160.48879,274.21741],sz=[60,40],flip=%t,theta=0,exprs=["F";"E"],pin=[],pout=[],pein=[],peout=8,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;0.1],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([190.48879),yy: new ScilabDouble([274.21741),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([7,1,0]),to: new ScilabDouble([3,2,1])}));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([112.34974),yy: new ScilabDouble([274.21741),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([6,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[174.57795,196.09381],sz=[20,20],flip=%t,theta=0,exprs="1",pin=11,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[174.57795,196.09381],sz=[20,20],flip=%t,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([154.57795),yy: new ScilabDouble([206.09381),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([10,1,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -53,4 +53,5 @@ function PULSE_SC () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PerteDP.js b/data_structures/PerteDP.js
index 09279f9..b1b5616 100644
--- a/data_structures/PerteDP.js
+++ b/data_structures/PerteDP.js
@@ -2,7 +2,7 @@ function PerteDP () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 
 	var L = 10;
@@ -25,15 +25,16 @@ function PerteDP () {
 	mo.model = new ScilabString(["PerteDP"]);
 	mo.inputs = new ScilabString(["C1"]);
 	mo.outputs = new ScilabString(["C2"]);
-	mo.parameters=list(["L";"D";"lambda";"z1";"z2";"p_rho"],[L],[D],[lambda],[z1],[z2],[p_rho]);
+	mo.parameters=list(new ScilabString(["L";"D";"lambda";"z1";"z2";"p_rho"]),[L],[D],[lambda],[z1],[z2],[p_rho]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[L.toString()],[D.toString()],[lambda.toString()],[z1.toString()],[z2.toString()],[p_rho.toString()]];
+	var exprs = [[string(L)],[string(D)],[string(lambda)],[string(z1)],[string(z2)],[string(p_rho)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PotentialSensor.js b/data_structures/PotentialSensor.js
index 909439d..1edfa55 100644
--- a/data_structures/PotentialSensor.js
+++ b/data_structures/PotentialSensor.js
@@ -2,7 +2,7 @@ function PotentialSensor () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble();
 	model.sim = new ScilabString(["PotentialSensor"]);
@@ -16,7 +16,8 @@ function PotentialSensor () {
 	model.equations=mo;
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,"",list(gr_i,0));
+	this.x=standard_define([2,2],model,"",list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["E"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/PuitsP.js b/data_structures/PuitsP.js
index 44b745c..550acd9 100644
--- a/data_structures/PuitsP.js
+++ b/data_structures/PuitsP.js
@@ -18,13 +18,14 @@ function PuitsP () {
 	var mo = modelica();
 	mo.model = new ScilabString(["Puits"]);
 	mo.inputs = new ScilabString(["C"]);
-	mo.parameters=list(["P0";"T0";"H0";"option_temperature"],[P0],[T0],[H0],[option_temperature]);
+	mo.parameters=list(new ScilabString(["P0";"T0";"H0";"option_temperature"]),[P0],[T0],[H0],[option_temperature]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 
-	var exprs = [[P0.toString()],[T0.toString()],[H0.toString()],[option_temperature.toString()]];
+	var exprs = [[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2.5,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2.5,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/QUANT_f.js b/data_structures/QUANT_f.js
index 67adc97..02d0830 100644
--- a/data_structures/QUANT_f.js
+++ b/data_structures/QUANT_f.js
@@ -7,15 +7,16 @@ function QUANT_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["qzrnd"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.rpar=new ScilabDouble([pas]);
 	model.ipar=new ScilabDouble([meth]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[pas.toString()],[meth.toString()]];
+	var exprs = [[string(pas)],[string(meth)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RAMP.js b/data_structures/RAMP.js
index f6f442b..3ff9355 100644
--- a/data_structures/RAMP.js
+++ b/data_structures/RAMP.js
@@ -10,8 +10,8 @@ function RAMP () {
 	var rpar = [[slope],[stt],[iout]];
 
 	var model = scicos_model();
-	model.sim=list("ramp",4);
-	model.in = new ScilabDouble();
+	model.sim=list(new ScilabString(["ramp"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
 	model.rpar=rpar;
 	model.blocktype = new ScilabString(["c"]);
@@ -19,8 +19,9 @@ function RAMP () {
 	model.nzcross = new ScilabDouble([1]);
 	model.dep_ut = new ScilabBoolean([false,true]);
 
-	var exprs = [rpar.toString()];
+	var exprs = [string(rpar)];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RAND_m.js b/data_structures/RAND_m.js
index 7569ac8..f017471 100644
--- a/data_structures/RAND_m.js
+++ b/data_structures/RAND_m.js
@@ -15,7 +15,7 @@ function RAND_m () {
 
 	var model = scicos_model();
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble();
+	model.in1 = new ScilabDouble();
 	model.in2 = new ScilabDouble();
 	model.intyp = new ScilabDouble();
 	model.out = new ScilabDouble([1]);
@@ -31,8 +31,9 @@ function RAND_m () {
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[sci2exp(1)],[flag.toString()],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate(1),int(rand()*(10^7-1))])]];
+	var exprs = [[sci2exp(1)],[string(flag)],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate(1),int(rand()*(10^7-1))])]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RATELIMITER.js b/data_structures/RATELIMITER.js
index d8f0d60..3c859f8 100644
--- a/data_structures/RATELIMITER.js
+++ b/data_structures/RATELIMITER.js
@@ -8,15 +8,16 @@ function RATELIMITER () {
 	var rpar = [[maxp],[minp]];
 
 	var model = scicos_model();
-	model.sim=list("ratelimiter",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["ratelimiter"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar=rpar;
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[maxp.toString()],[minp.toString()]];
+	var exprs = [[string(maxp)],[string(minp)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/READAU_f.js b/data_structures/READAU_f.js
index 13b2920..a7ef985 100644
--- a/data_structures/READAU_f.js
+++ b/data_structures/READAU_f.js
@@ -24,7 +24,7 @@ function READAU_f () {
 	var nout = size(outmask,"*");
 
 	var model = scicos_model();
-	model.sim=list("readau",2);
+	model.sim=list(new ScilabString(["readau"]),new ScilabDouble([2]));
 	model.out=nout;
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([1],[1],[lunit],[zeros(N*M,1)]);
@@ -32,8 +32,9 @@ function READAU_f () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[fname],[N.toString()],[swap.toString()]];
+	var exprs = [[fname],[string(N)],[string(swap)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/READC_f.js b/data_structures/READC_f.js
index 5fa7340..cc406db 100644
--- a/data_structures/READC_f.js
+++ b/data_structures/READC_f.js
@@ -28,7 +28,7 @@ function READC_f () {
 	var ipar = [[,length(fname)],[,_str2code(frmt)],[,ievt],[,N],[,M],[,swap],[offset],[,_str2code(fname)],[,tmask],[,outmask,]];
 
 	var model = scicos_model();
-	model.sim=list("readc",2);
+	model.sim=list(new ScilabString(["readc"]),new ScilabDouble([2]));
 	model.out=nout;
 	model.evtin = new ScilabDouble([1]);
 	model.evtout = new ScilabDouble();
@@ -38,8 +38,9 @@ function READC_f () {
 	model.firing = new ScilabDouble([-1]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[,"[]"],[,sci2exp(outmask)],[,fname],[,frmt],[,M.toString()],[,N.toString()],[,offset.toString()],[swap.toString(),]];
+	var exprs = [[,"[]"],[,sci2exp(outmask)],[,fname],[,frmt],[,string(M)],[,string(N)],[,string(offset)],[string(swap),]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/REGISTER.js b/data_structures/REGISTER.js
index 37ca472..6b9b247 100644
--- a/data_structures/REGISTER.js
+++ b/data_structures/REGISTER.js
@@ -4,16 +4,17 @@ function REGISTER () {
 	var z0 = zeros(10,1);
 
 	var model = scicos_model();
-	model.sim=list("delay4",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["delay4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.dstate=z0;
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = strcat(z0.toString(),,";");
+	var exprs = strcat(string(z0),,";");
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RELATIONALOP.js b/data_structures/RELATIONALOP.js
index 3e2145c..72fd81c 100644
--- a/data_structures/RELATIONALOP.js
+++ b/data_structures/RELATIONALOP.js
@@ -6,16 +6,17 @@ function RELATIONALOP () {
 	var label = "&lt";
 
 	var model = scicos_model();
-	model.sim=list("relationalop",4);
-	model.in = new ScilabDouble([1],[1]);
+	model.sim=list(new ScilabString(["relationalop"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 	model.ipar=new ScilabDouble([ipar]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[ipar.toString()],[0.toString()]];
+	var exprs = [[string(ipar)],[string(0)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
 	this.x.graphics.style = new ScilabString(["fontSize=13;fontStyle=1;displayedLabel="+label]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RELAY_f.js b/data_structures/RELAY_f.js
index ec6d721..56000db 100644
--- a/data_structures/RELAY_f.js
+++ b/data_structures/RELAY_f.js
@@ -3,22 +3,23 @@ function RELAY_f () {
 
 	var i0 = 0;
 
-	var in = [[-1],[-1]];
+	var in1 = [[-1],[-1]];
 
 	var nin = 2;
 
 	var model = scicos_model();
-	model.sim=list("relay",2);
-	model.in=in;
+	model.sim=list(new ScilabString(["relay"]),new ScilabDouble([2]));
+	model.in1.push(in1);
 	model.out = new ScilabDouble([-1]);
-	model.evtin=ones(in);
+	model.evtin=ones(in1);
 	model.dstate=new ScilabDouble([i0]);
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([true,true]);
 
-	var exprs = [[nin.toString()],[i0+1.toString()]];
+	var exprs = [[string(nin)],[string(i0+1)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RFILE_f.js b/data_structures/RFILE_f.js
index 19369ca..10fbc93 100644
--- a/data_structures/RFILE_f.js
+++ b/data_structures/RFILE_f.js
@@ -32,8 +32,9 @@ function RFILE_f () {
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[sci2exp([])],[sci2exp(outmask)],[fname],[frmt],[N.toString()],[sci2exp(out)]];
+	var exprs = [[sci2exp([])],[sci2exp(outmask)],[fname],[frmt],[string(N)],[sci2exp(out)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/RICC.js b/data_structures/RICC.js
index bea104f..1eaf89b 100644
--- a/data_structures/RICC.js
+++ b/data_structures/RICC.js
@@ -7,7 +7,7 @@ function RICC () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1],[-1],[-1]);
+	model.in1 = new ScilabDouble([-1],[-1],[-1]);
 	model.in2 = new ScilabDouble([-1],[-1],[-1]);
 	model.intyp = new ScilabDouble([1,1,1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function RICC () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ROOTCOEF.js b/data_structures/ROOTCOEF.js
index 049fda3..df1eaad 100644
--- a/data_structures/ROOTCOEF.js
+++ b/data_structures/ROOTCOEF.js
@@ -7,7 +7,7 @@ function ROOTCOEF () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-2]);
@@ -27,4 +27,5 @@ function ROOTCOEF () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Resistor.js b/data_structures/Resistor.js
index 01d1f0b..10b72c3 100644
--- a/data_structures/Resistor.js
+++ b/data_structures/Resistor.js
@@ -13,15 +13,16 @@ function Resistor () {
 	mo.model = new ScilabString(["Resistor"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list("R",list(R));
+	mo.parameters=list(new ScilabString(["R"]),list(R));
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = R.toString();
+	var exprs = string(R);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,1]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,1],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SAMPHOLD_m.js b/data_structures/SAMPHOLD_m.js
index 210a61c..0a52809 100644
--- a/data_structures/SAMPHOLD_m.js
+++ b/data_structures/SAMPHOLD_m.js
@@ -2,8 +2,8 @@ function SAMPHOLD_m () {
 
 
 	var model = scicos_model();
-	model.sim=list("samphold4_m",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["samphold4_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.outtyp = new ScilabDouble([1]);
@@ -17,4 +17,5 @@ function SAMPHOLD_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SATURATION.js b/data_structures/SATURATION.js
index e291f50..37a218a 100644
--- a/data_structures/SATURATION.js
+++ b/data_structures/SATURATION.js
@@ -8,8 +8,8 @@ function SATURATION () {
 	var rpar = [[maxp],[minp]];
 
 	var model = scicos_model();
-	model.sim=list("satur",4);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString(["satur"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([1]);
 	model.nzcross = new ScilabDouble([2]);
 	model.nmode = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -17,8 +17,9 @@ function SATURATION () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[maxp.toString()],[minp.toString()],[model.nmode.toString()]];
+	var exprs = [[string(maxp)],[string(minp)],[string(model.nmode)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SAWTOOTH_f.js b/data_structures/SAWTOOTH_f.js
index 085851a..fcbe8e6 100644
--- a/data_structures/SAWTOOTH_f.js
+++ b/data_structures/SAWTOOTH_f.js
@@ -13,4 +13,5 @@ function SAWTOOTH_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SCALAR2VECTOR.js b/data_structures/SCALAR2VECTOR.js
index d8959cc..67c696c 100644
--- a/data_structures/SCALAR2VECTOR.js
+++ b/data_structures/SCALAR2VECTOR.js
@@ -4,14 +4,15 @@ function SCALAR2VECTOR () {
 	var nout = -1;
 
 	var model = scicos_model();
-	model.sim=list("scalar2vector",4);
+	model.sim=list(new ScilabString(["scalar2vector"]),new ScilabDouble([4]));
 	model.out=new ScilabDouble([nout]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[nout].toString()];
+	var exprs = [string([nout])];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SELECT_m.js b/data_structures/SELECT_m.js
index 021f1f3..e4970c8 100644
--- a/data_structures/SELECT_m.js
+++ b/data_structures/SELECT_m.js
@@ -6,8 +6,8 @@ function SELECT_m () {
 	var nin = 2;
 
 	var model = scicos_model();
-	model.sim=list("selector_m",4);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["selector_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.in2 = new ScilabDouble([-2],[-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function SELECT_m () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SELF_SWITCH.js b/data_structures/SELF_SWITCH.js
index 37d47b7..0966f74 100644
--- a/data_structures/SELF_SWITCH.js
+++ b/data_structures/SELF_SWITCH.js
@@ -9,7 +9,7 @@ function SELF_SWITCH () {
 	this.x.graphics.pin = new ScilabDouble([0]);
 	this.x.graphics.pout = new ScilabDouble([0]);
 	this.x.model.sim = new ScilabString(["csuper"]);
-	this.x.model.in = new ScilabDouble([1]);
+	this.x.model.in1 = new ScilabDouble([1]);
 	this.x.model.out = new ScilabDouble([1]);
 	this.x.model.blocktype = new ScilabString(["h"]);
 	this.x.model.dep_ut = new ScilabBoolean([false,false]);
@@ -20,4 +20,5 @@ function SELF_SWITCH () {
 	this.x.graphics.out_implicit = new ScilabString(["E"]);
 	this.x.graphics.out_style = new ScilabString([""]);
 	this.x.graphics.style = new ScilabString(["SELF_SWITCH_OFF"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SHIFT.js b/data_structures/SHIFT.js
index 19673ee..9d94041 100644
--- a/data_structures/SHIFT.js
+++ b/data_structures/SHIFT.js
@@ -6,8 +6,8 @@ function SHIFT () {
 	var OPER = 0;
 
 	var model = scicos_model();
-	model.sim=list("shift_32_LA",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["shift_32_LA"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.out2 = new ScilabDouble([-2]);
@@ -22,4 +22,5 @@ function SHIFT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SIGNUM.js b/data_structures/SIGNUM.js
index 6c0cda6..39133f5 100644
--- a/data_structures/SIGNUM.js
+++ b/data_structures/SIGNUM.js
@@ -4,16 +4,17 @@ function SIGNUM () {
 	var nu = -1;
 
 	var model = scicos_model();
-	model.sim=list("signum",4);
-	model.in=new ScilabDouble([nu]);
+	model.sim=list(new ScilabString(["signum"]),new ScilabDouble([4]));
+	model.in1.push(new ScilabDouble([nu]));
 	model.out=new ScilabDouble([nu]);
 	model.nzcross=new ScilabDouble([nu]);
 	model.nmode=new ScilabDouble([nu]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[1].toString()];
+	var exprs = [string([1])];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SINBLK_f.js b/data_structures/SINBLK_f.js
index 2730bfa..eda3ed0 100644
--- a/data_structures/SINBLK_f.js
+++ b/data_structures/SINBLK_f.js
@@ -3,7 +3,7 @@ function SINBLK_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["sinblk"]);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -12,4 +12,5 @@ function SINBLK_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SOM_f.js b/data_structures/SOM_f.js
index 223f883..d17adbe 100644
--- a/data_structures/SOM_f.js
+++ b/data_structures/SOM_f.js
@@ -4,8 +4,8 @@ function SOM_f () {
 	var sgn = [[1],[1],[1]];
 
 	var model = scicos_model();
-	model.sim=list("sum",2);
-	model.in = new ScilabDouble([-1],[-1],[-1]);
+	model.sim=list(new ScilabString(["sum"]),new ScilabDouble([2]));
+	model.in1 = new ScilabDouble([-1],[-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.rpar=new ScilabDouble([sgn]);
 	model.blocktype = new ScilabString(["c"]);
@@ -15,4 +15,5 @@ function SOM_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SQRT.js b/data_structures/SQRT.js
index 535bcb2..9988080 100644
--- a/data_structures/SQRT.js
+++ b/data_structures/SQRT.js
@@ -2,8 +2,8 @@ function SQRT () {
 
 
 	var model = scicos_model();
-	model.sim=list("mat_sqrt",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["mat_sqrt"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.outtyp = new ScilabDouble([1]);
@@ -15,4 +15,5 @@ function SQRT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SRFLIPFLOP.js b/data_structures/SRFLIPFLOP.js
index fe5f83e..ae291fd 100644
--- a/data_structures/SRFLIPFLOP.js
+++ b/data_structures/SRFLIPFLOP.js
@@ -1,8 +1,8 @@
 function SRFLIPFLOP () {
 
 
-	var scs_m = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m.objs.push(scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=%t,theta=0,exprs=["[0,1;1,0;1,0;1,0;0,1;0,1;0,0;0,0]";"1"],pin=[4;10;12],pout=[3;8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit=["E";"E"]),model=scicos_model(sim=list("logic",4),in=[1],[1],[1],in2=[1],[1],[1],intyp=[5],[5],[5],out=[1],[1],out2=[1],[1],outtyp=[5],[5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1);
+	var scs_m = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001;0.000001;1.000E-10;100001;0;0;0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m.objs.push(scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=%t,theta=0,exprs=["[0,1;1,0;1,0;1,0;0,1;0,1;0,0;0,0]";"1"],pin=[4;10;12],pout=[3;8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E";"E";"E"],out_implicit=["E";"E"]),model=scicos_model(sim=list("logic",4),in1=[1],[1],[1],in2=[1],[1],[1],intyp=[5],[5],[5],out=[1],[1],out2=[1],[1],outtyp=[5],[5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1);
 	1,0;
 	1,0;
 	1,0;
@@ -11,23 +11,23 @@ function SRFLIPFLOP () {
 	0,0;
 
 	var 0,0])),blocktype = "c",firing=%f,dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list());
-	scs_m.objs.push(scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=%f,theta=0,exprs=["int8(0)";"1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=%f,theta=0,exprs=["int8(0)";"1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(new ScilabInteger([0])),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([347.07543),yy: new ScilabDouble([228.11733),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([5,1,1])}));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([290.6659),yy: new ScilabDouble([274.25067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([2,1,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=3,pout=[6;14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=3,pout=[6;14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E";"E";"E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1;-1;-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[%t,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([363.03733),yy: new ScilabDouble([248.584),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([5,1,0]),to: new ScilabDouble([2,1,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=%t,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=%t,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([347.07543),yy: new ScilabDouble([214.784),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,2,0]),to: new ScilabDouble([7,1,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=%t,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([269.93257),yy: new ScilabDouble([221.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([9,1,0]),to: new ScilabDouble([1,2,1])}));
-	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=%t,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([269.93257),yy: new ScilabDouble([211.45067),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([11,1,0]),to: new ScilabDouble([1,3,1])}));
-	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=%t,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=%t,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m.objs.push(scicos_link({xx: new ScilabDouble([363.03733),yy: new ScilabDouble([248.584),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([5,2,0]),to: new ScilabDouble([13,1,1])}));
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["csuper"]);
-	model.in = new ScilabDouble([1],[1]);
+	model.in1 = new ScilabDouble([1],[1]);
 	model.in2 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1],[1]);
 	model.out2 = new ScilabDouble([1],[1]);
@@ -40,4 +40,5 @@ function SRFLIPFLOP () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/STEP_FUNCTION.js b/data_structures/STEP_FUNCTION.js
index 921a0b8..483a4c2 100644
--- a/data_structures/STEP_FUNCTION.js
+++ b/data_structures/STEP_FUNCTION.js
@@ -53,4 +53,5 @@ function STEP_FUNCTION () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SUBMAT.js b/data_structures/SUBMAT.js
index 8c7fd11..b8cea53 100644
--- a/data_structures/SUBMAT.js
+++ b/data_structures/SUBMAT.js
@@ -7,7 +7,7 @@ function SUBMAT () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([-1]);
+	model.in1 = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -27,4 +27,5 @@ function SUBMAT () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2.5,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SUMMATION.js b/data_structures/SUMMATION.js
index 5ce2fc4..4c7fe1b 100644
--- a/data_structures/SUMMATION.js
+++ b/data_structures/SUMMATION.js
@@ -4,8 +4,8 @@ function SUMMATION () {
 	var sgn = [[1],[-1]];
 
 	var model = scicos_model();
-	model.sim=list("summation",4);
-	model.in = new ScilabDouble([-1],[-1]);
+	model.sim=list(new ScilabString(["summation"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.in2 = new ScilabDouble([-2],[-2]);
 	model.out2 = new ScilabDouble([-2]);
@@ -17,4 +17,5 @@ function SUMMATION () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,3]),model,,exprs,gr_i);
+	return new Summation(this.x)
 }
diff --git a/data_structures/SUM_f.js b/data_structures/SUM_f.js
index 4ee32df..2497a34 100644
--- a/data_structures/SUM_f.js
+++ b/data_structures/SUM_f.js
@@ -2,8 +2,8 @@ function SUM_f () {
 
 
 	var model = scicos_model();
-	model.sim=list("plusblk",2);
-	model.in = new ScilabDouble([-1],[-1],[-1]);
+	model.sim=list(new ScilabString(["plusblk"]),new ScilabDouble([2]));
+	model.in1 = new ScilabDouble([-1],[-1],[-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -12,4 +12,5 @@ function SUM_f () {
 
 	var exprs = [];
 	this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i);
+	return new RoundBlock(this.x)
 }
diff --git a/data_structures/SUPER_f.js b/data_structures/SUPER_f.js
index 8b5babc..5ed120a 100644
--- a/data_structures/SUPER_f.js
+++ b/data_structures/SUPER_f.js
@@ -4,19 +4,19 @@ function SUPER_f () {
 	var scs = scicos_diagram();
 	scs.props.title = new ScilabString(["Super,Block"]);
 
-	var in = IN_f("define");
-	in.graphics.orig = new ScilabDouble([40,,40]);
-	in.graphics.sz = new ScilabDouble([20,,20]);
+	var in1 = IN_f("define");
+	in1.graphics.orig = new ScilabDouble([40,,40]);
+	in1.graphics.sz = new ScilabDouble([20,,20]);
 
 	var out = OUT_f("define");
 	out.graphics.orig = new ScilabDouble([240,,40]);
 	out.graphics.sz = new ScilabDouble([20,,20]);
-	scs.objs.push(in);
+	scs.objs.push(in1);
 	scs.objs.push(out);
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["super"]);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.rpar=scs;
 	model.blocktype = new ScilabString(["h"]);
@@ -24,4 +24,5 @@ function SUPER_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new SuperBlock(this.x)
 }
diff --git a/data_structures/SWITCH2_m.js b/data_structures/SWITCH2_m.js
index f19b2bc..4c1934a 100644
--- a/data_structures/SWITCH2_m.js
+++ b/data_structures/SWITCH2_m.js
@@ -8,8 +8,8 @@ function SWITCH2_m () {
 	var rpar = 0;
 
 	var model = scicos_model();
-	model.sim=list("switch2_m",4);
-	model.in = new ScilabDouble([-1],[1],[-1]);
+	model.sim=list(new ScilabString(["switch2_m"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1],[1],[-1]);
 	model.in2 = new ScilabDouble([-2],[1],[-2]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([-1]);
@@ -22,8 +22,9 @@ function SWITCH2_m () {
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[sci2exp(1)],[ipar.toString()],[rpar.toString()],[nzz.toString()]];
+	var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(nzz)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SWITCH_f.js b/data_structures/SWITCH_f.js
index 525a325..f9a4f5e 100644
--- a/data_structures/SWITCH_f.js
+++ b/data_structures/SWITCH_f.js
@@ -3,21 +3,22 @@ function SWITCH_f () {
 
 	var i0 = 0;
 
-	var in = [[-1],[-1]];
+	var in1 = [[-1],[-1]];
 
 	var nin = 2;
 
 	var model = scicos_model();
-	model.sim=list("switchn",2);
-	model.in=in;
+	model.sim=list(new ScilabString(["switchn"]),new ScilabDouble([2]));
+	model.in1.push(in1);
 	model.out = new ScilabDouble([-1]);
 	model.ipar=new ScilabDouble([i0]);
 	model.blocktype = new ScilabString(["c"]);
 	model.firing = new ScilabDouble();
 	model.dep_ut = new ScilabBoolean([true,true]);
 
-	var exprs = [[nin.toString()],[i0+1.toString()]];
+	var exprs = [[string(nin)],[string(i0+1)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SampleCLK.js b/data_structures/SampleCLK.js
index caacb0f..51bf28a 100644
--- a/data_structures/SampleCLK.js
+++ b/data_structures/SampleCLK.js
@@ -11,4 +11,5 @@ function SampleCLK () {
 
 	var exprs = [[sci2exp(1)],[sci2exp(0)]];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs," ");
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Sigbuilder.js b/data_structures/Sigbuilder.js
index 732de66..a4c176c 100644
--- a/data_structures/Sigbuilder.js
+++ b/data_structures/Sigbuilder.js
@@ -1,18 +1,19 @@
 function Sigbuilder () {
 
 
-	var scs_m_1 = [scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["Sigbuilder","./"],tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],tf=100,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()))];
-	scs_m_1.objs.push(scicos_block(gui="CURVE_c",graphics=scicos_graphics(orig=[329.63473,606.18517],sz=[40,40],flip=%t,theta=0,exprs=["3";"[0,1,2]";"[10,20,-30]";"y";"n"],pin=[],pout=6,pein=4,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("curve_c",4),in=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[0;1;2;10;20;-30],ipar=[3;3;1],opar=list(),blocktype="c",firing=0,dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	var scs_m_1 = scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["Sigbuilder","./"],tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],tf=100,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CURVE_c",graphics=scicos_graphics(orig=[329.63473,606.18517],sz=[40,40],flip=%t,theta=0,exprs=["3";"[0,1,2]";"[10,20,-30]";"y";"n"],pin=[],pout=6,pein=4,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("curve_c",4),in1=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[0;1;2;10;20;-30],ipar=[3;3;1],opar=list(),blocktype="c",firing=0,dep_ut=[%f,%t],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([349.63473),yy: new ScilabDouble([600.47089),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([3,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[349.49528;565.10704],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=2,peout=[8;4],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[349.49528;565.10704],sz=[0.3333333,0.3333333],flip=%t,theta=0,exprs=[],pin=[],pout=[],pein=2,peout=[8;4],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1;1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[%f,%f,%f],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([349.49528),yy: new ScilabDouble([565.10704),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([3,2,0]),to: new ScilabDouble([1,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[398.20616,616.18517],sz=[20,20],flip=%t,theta=0,exprs="1",pin=6,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in=-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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[398.20616,616.18517],sz=[20,20],flip=%t,theta=0,exprs="1",pin=6,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([378.20616),yy: new ScilabDouble([626.18517),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([1,1]),from: new ScilabDouble([1,1,0]),to: new ScilabDouble([5,1,1])}));
-	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=%t,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
+	scs_m_1.objs.push(scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=%t,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=[%f,%f],label="",nzcross=0,nmode=0,equations=list()),doc=list()));
 	scs_m_1.objs.push(scicos_link({xx: new ScilabDouble([349.49528),yy: new ScilabDouble([565.10704),thick: new ScilabDouble([0,0]),ct: new ScilabDouble([5,-1]),from: new ScilabDouble([3,1,0]),to: new ScilabDouble([7,1,1])}));
 
-	var model = [scicos_model(sim="csuper",in=[],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=[%f,%f],label="",nzcross=0,nmode=0,equations=list())];
+	var 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=[%f,%f],label="",nzcross=0,nmode=0,equations=list());
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SineVoltage.js b/data_structures/SineVoltage.js
index d715567..99e8b10 100644
--- a/data_structures/SineVoltage.js
+++ b/data_structures/SineVoltage.js
@@ -2,7 +2,7 @@ function SineVoltage () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 
 	var V = 1;
@@ -23,13 +23,14 @@ function SineVoltage () {
 	mo.model = new ScilabString(["SineVoltage"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list(["V";"phase";"freqHz";"offset";"startTime"],list(V,ph,frq,offset,start));
+	mo.parameters=list(new ScilabString(["V";"phase";"freqHz";"offset";"startTime"]),list(V,ph,frq,offset,start));
 	model.equations=mo;
 
-	var exprs = [[V.toString()],[ph.toString()],[frq.toString()],[offset.toString()],[start.toString()]];
+	var exprs = [[string(V)],[string(ph)],[string(frq)],[string(offset)],[string(start)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/SourceP.js b/data_structures/SourceP.js
index fbc3f4a..fa2cd52 100644
--- a/data_structures/SourceP.js
+++ b/data_structures/SourceP.js
@@ -19,14 +19,15 @@ function SourceP () {
 	mo.model = new ScilabString(["Source"]);
 	mo.inputs = new ScilabDouble();
 	mo.outputs = new ScilabString(["C"]);
-	mo.parameters=list(["P0";"T0";"H0";"option_temperature"],[P0],[T0],[H0],[option_temperature]);
+	mo.parameters=list(new ScilabString(["P0";"T0";"H0";"option_temperature"]),[P0],[T0],[H0],[option_temperature]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[P0.toString()],[T0.toString()],[H0.toString()],[option_temperature.toString()]];
+	var exprs = [[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2.5,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2.5,2],model,exprs,list(gr_i,0));
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/Switch.js b/data_structures/Switch.js
index 80a3b74..3b7d196 100644
--- a/data_structures/Switch.js
+++ b/data_structures/Switch.js
@@ -20,14 +20,15 @@ function Switch () {
 	mo.outputs = new ScilabString(["n"]);
 	mo.parameters=list(S,Z);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 	model.rpar=Z;
 
-	var exprs = Z.toString();
+	var exprs = string(Z);
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I";"E"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TANBLK_f.js b/data_structures/TANBLK_f.js
index a1dcf60..e20343a 100644
--- a/data_structures/TANBLK_f.js
+++ b/data_structures/TANBLK_f.js
@@ -1,17 +1,18 @@
 function TANBLK_f () {
 
 
-	var in = -1;
+	var in1 = -1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["tanblk"]);
-	model.in=new ScilabDouble([in]);
-	model.out=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
+	model.out=new ScilabDouble([in1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = sci2exp(in);
+	var exprs = sci2exp(in1);
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TCLSS.js b/data_structures/TCLSS.js
index 13e57df..f472447 100644
--- a/data_structures/TCLSS.js
+++ b/data_structures/TCLSS.js
@@ -1,17 +1,17 @@
 function TCLSS () {
 
 
-	var x0 = [0],[A=0],[B=1],[C=1],[D=0];
+	var x0 = 0],[A=0],[B=1],[C=1],[D=0;
 
-	var in = 1;
+	var in1 = 1;
 
 	var nx = size(x0,"*");
 
 	var out = 1;
 
 	var model = scicos_model();
-	model.sim=list("tcslti4",4);
-	model.in = new ScilabDouble([in],[nx]);
+	model.sim=list(new ScilabString(["tcslti4"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([in1],[nx]);
 	model.out=new ScilabDouble([out]);
 	model.evtin = new ScilabDouble([1]);
 	model.state=new ScilabDouble([x0]);
@@ -23,4 +23,5 @@ function TCLSS () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TEXT_f.js b/data_structures/TEXT_f.js
index 9cb18e1..4ca293e 100644
--- a/data_structures/TEXT_f.js
+++ b/data_structures/TEXT_f.js
@@ -10,11 +10,12 @@ function TEXT_f () {
 	model.rpar = new ScilabString(["Text"]);
 	model.ipar = new ScilabDouble([font],[siz]);
 
-	var exprs = [["Text"],[font.toString()],[,siz.toString()]];
+	var exprs = [["Text"],[string(font)],[,string(siz)]];
 
 	var graphics = scicos_graphics();
 	graphics.orig = new ScilabDouble([0,0]);
 	graphics.sz = new ScilabDouble([2,1]);
 	graphics.exprs=new ScilabString([exprs]);
 	this.x=mlist(new ScilabString(["Text","graphics","model","void","gui"]),graphics,model,new ScilabString([" "]),new ScilabString(["TEXT_f"]));
+	return new TextBlock(this.x)
 }
diff --git a/data_structures/TIME_DELAY.js b/data_structures/TIME_DELAY.js
index d58682a..82a1e99 100644
--- a/data_structures/TIME_DELAY.js
+++ b/data_structures/TIME_DELAY.js
@@ -10,16 +10,17 @@ function TIME_DELAY () {
 	var N = 1024;
 
 	var model = scicos_model();
-	model.sim=list("time_delay",4);
-	model.in = new ScilabDouble([nin]);
+	model.sim=list(new ScilabString(["time_delay"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([nin]);
 	model.out=new ScilabDouble([nin]);
 	model.rpar = new ScilabDouble([T,init]);
 	model.ipar=new ScilabDouble([N]);
 	model.blocktype = new ScilabString(["x"]);
 	model.dep_ut = new ScilabBoolean([false,true]);
 
-	var exprs = [[T.toString()],[init.toString()],[N.toString()]];
+	var exprs = [[string(T)],[string(init)],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3.5,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TIME_f.js b/data_structures/TIME_f.js
index b32a51f..69d4312 100644
--- a/data_structures/TIME_f.js
+++ b/data_structures/TIME_f.js
@@ -9,4 +9,5 @@ function TIME_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TKSCALE.js b/data_structures/TKSCALE.js
index dd1a304..5c7bd8e 100644
--- a/data_structures/TKSCALE.js
+++ b/data_structures/TKSCALE.js
@@ -8,7 +8,7 @@ function TKSCALE () {
 	var f = 1;
 
 	var model = scicos_model();
-	model.sim=list("tkscaleblk",5);
+	model.sim=list(new ScilabString(["tkscaleblk"]),new ScilabDouble([5]));
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([a],[b],[f]);
@@ -19,4 +19,5 @@ function TKSCALE () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TOWS_c.js b/data_structures/TOWS_c.js
index 29c5d99..6094f11 100644
--- a/data_structures/TOWS_c.js
+++ b/data_structures/TOWS_c.js
@@ -10,8 +10,8 @@ function TOWS_c () {
 	var herit = 0;
 
 	var model = scicos_model();
-	model.sim=list("tows_c",,4);
-	model.in = new ScilabDouble([nu]);
+	model.sim=list(new ScilabString(["tows_c"]),,new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([nu]);
 	model.in2 = new ScilabDouble([-2]);
 	model.intyp = new ScilabDouble([-1]);
 	model.out = new ScilabDouble();
@@ -25,6 +25,7 @@ function TOWS_c () {
 
 	var gr_i = [];
 
-	var exprs = [[nz.toString()],[,varnam.toString()],[,herit.toString()]];
+	var exprs = [[string(nz)],[,string(varnam)],[,string(herit)]];
 	this.x=new standard_define(new ScilabDouble([4,2]),,model,,exprs,,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TRASH_f.js b/data_structures/TRASH_f.js
index 7a02e7e..c9e4ac4 100644
--- a/data_structures/TRASH_f.js
+++ b/data_structures/TRASH_f.js
@@ -1,11 +1,11 @@
 function TRASH_f () {
 
 
-	var in = -1;
+	var in1 = -1;
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["trash"]);
-	model.in=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.evtin = new ScilabDouble([1]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
@@ -14,4 +14,5 @@ function TRASH_f () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/TrigFun.js b/data_structures/TrigFun.js
index ec6b718..736a8c2 100644
--- a/data_structures/TrigFun.js
+++ b/data_structures/TrigFun.js
@@ -2,8 +2,8 @@ function TrigFun () {
 
 
 	var model = scicos_model();
-	model.sim=list("sin_blk",4);
-	model.in = new ScilabDouble([-1]);
+	model.sim=list(new ScilabString(["sin_blk"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([-1]);
 	model.out = new ScilabDouble([-1]);
 	model.blocktype = new ScilabString(["c"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
@@ -12,4 +12,5 @@ function TrigFun () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VARIABLE_DELAY.js b/data_structures/VARIABLE_DELAY.js
index 3343b79..81d29f1 100644
--- a/data_structures/VARIABLE_DELAY.js
+++ b/data_structures/VARIABLE_DELAY.js
@@ -10,16 +10,17 @@ function VARIABLE_DELAY () {
 	var N = 1024;
 
 	var model = scicos_model();
-	model.sim=list("variable_delay",4);
-	model.in = new ScilabDouble([nin],[1]);
+	model.sim=list(new ScilabString(["variable_delay"]),new ScilabDouble([4]));
+	model.in1 = new ScilabDouble([nin],[1]);
 	model.out=new ScilabDouble([nin]);
 	model.rpar = new ScilabDouble([T,init]);
 	model.ipar=new ScilabDouble([N]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([false,false]);
 
-	var exprs = [[T.toString()],[init.toString()],[N.toString()]];
+	var exprs = [[string(T)],[string(init)],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VVsourceAC.js b/data_structures/VVsourceAC.js
index 98aec0c..78dcc38 100644
--- a/data_structures/VVsourceAC.js
+++ b/data_structures/VVsourceAC.js
@@ -2,7 +2,7 @@ function VVsourceAC () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1],[1]);
+	model.in1 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 
 	var VA = 220;
@@ -17,13 +17,14 @@ function VVsourceAC () {
 	mo.model = new ScilabString(["VVsourceAC"]);
 	mo.inputs = new ScilabString(["p","VA"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list(["f"],list(FR));
+	mo.parameters=list(new ScilabString(["f"]),list(FR));
 	model.equations=mo;
 
-	var exprs = [FR.toString()];
+	var exprs = [string(FR)];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I","E"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VanneReglante.js b/data_structures/VanneReglante.js
index 09db3d0..8e3dc25 100644
--- a/data_structures/VanneReglante.js
+++ b/data_structures/VanneReglante.js
@@ -2,7 +2,7 @@ function VanneReglante () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1],[1]);
+	model.in1 = new ScilabDouble([1],[1]);
 	model.out = new ScilabDouble([1]);
 
 	var Cvmax = 8005.42;
@@ -17,15 +17,16 @@ function VanneReglante () {
 	mo.model = new ScilabString(["VanneReglante"]);
 	mo.inputs = new ScilabString(["C1" "Ouv"]);
 	mo.outputs = new ScilabString(["C2"]);
-	mo.parameters=list(["Cvmax";"p_rho"],[Cvmax],[p_rho]);
+	mo.parameters=list(new ScilabString(["Cvmax";"p_rho"]),[Cvmax],[p_rho]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
-	var exprs = [[Cvmax.toString()],[p_rho.toString()]];
+	var exprs = [[string(Cvmax)],[string(p_rho)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I";"E"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VariableResistor.js b/data_structures/VariableResistor.js
index b21ae1a..bfb7914 100644
--- a/data_structures/VariableResistor.js
+++ b/data_structures/VariableResistor.js
@@ -11,13 +11,14 @@ function VariableResistor () {
 	mo.inputs = new ScilabString(["p","R"]);
 	mo.outputs = new ScilabString(["n"]);
 	model.equations=mo;
-	model.in=ones(size(mo.inputs,"*"),1);
+	model.in1.push(ones(size(mo.inputs,"*"),1));
 	model.out=ones(size(mo.outputs,"*"),1);
 
 	var exprs = [];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I","E"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VirtualCLK0.js b/data_structures/VirtualCLK0.js
index 7d5b129..82fa621 100644
--- a/data_structures/VirtualCLK0.js
+++ b/data_structures/VirtualCLK0.js
@@ -12,4 +12,5 @@ function VirtualCLK0 () {
 
 	var exprs = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs," ");
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/VoltageSensor.js b/data_structures/VoltageSensor.js
index cec9c07..3eab08a 100644
--- a/data_structures/VoltageSensor.js
+++ b/data_structures/VoltageSensor.js
@@ -2,7 +2,7 @@ function VoltageSensor () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1],[,1]);
 	model.sim = new ScilabString(["VoltageSensor"]);
 	model.blocktype = new ScilabString(["c"]);
@@ -17,7 +17,8 @@ function VoltageSensor () {
 	var exprs = [];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I";"E"]);
+	return new VoltageSensorBlock(this.x)
 }
diff --git a/data_structures/VsourceAC.js b/data_structures/VsourceAC.js
index 1174d8c..fa02afd 100644
--- a/data_structures/VsourceAC.js
+++ b/data_structures/VsourceAC.js
@@ -2,7 +2,7 @@ function VsourceAC () {
 
 
 	var model = scicos_model();
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 
 	var VA = 220;
@@ -17,13 +17,14 @@ function VsourceAC () {
 	mo.model = new ScilabString(["VsourceAC"]);
 	mo.inputs = new ScilabString(["p"]);
 	mo.outputs = new ScilabString(["n"]);
-	mo.parameters=list(["VA";"f"],list(VA,FR));
+	mo.parameters=list(new ScilabString(["VA";"f"]),list(VA,FR));
 	model.equations=mo;
 
-	var exprs = [[VA.toString()],[FR.toString()]];
+	var exprs = [[string(VA)],[string(FR)]];
 
 	var gr_i = [];
-	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,list(gr_i,0));
+	this.x=standard_define([2,2],model,exprs,list(gr_i,0));
 	this.x.graphics.in_implicit = new ScilabString(["I"]);
 	this.x.graphics.out_implicit = new ScilabString(["I"]);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/WFILE_f.js b/data_structures/WFILE_f.js
index ef7b82d..7e9a4ed 100644
--- a/data_structures/WFILE_f.js
+++ b/data_structures/WFILE_f.js
@@ -1,9 +1,9 @@
 function WFILE_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
-	var nin = sum(in);
+	var nin = sum(in1);
 
 	var frmt = "(7(e10.3,1x))";
 
@@ -15,15 +15,16 @@ function WFILE_f () {
 
 	var model = scicos_model();
 	model.sim = new ScilabString(["writef"]);
-	model.in=new ScilabDouble([in]);
+	model.in1.push(new ScilabDouble([in1]));
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*N,1)]);
 	model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[N],[_str2code(fname)],[_str2code(frmt)]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[sci2exp(in)],[fname],[frmt],[N.toString()]];
+	var exprs = [[sci2exp(in1)],[fname],[frmt],[string(N)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/WRITEAU_f.js b/data_structures/WRITEAU_f.js
index 4de3344..d831faf 100644
--- a/data_structures/WRITEAU_f.js
+++ b/data_structures/WRITEAU_f.js
@@ -1,9 +1,9 @@
 function WRITEAU_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
-	var nin = sum(in);
+	var nin = sum(in1);
 
 	var frmt = "uc,";
 
@@ -16,16 +16,17 @@ function WRITEAU_f () {
 	var N = 2;
 
 	var model = scicos_model();
-	model.sim=list("writeau",2);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["writeau"]),new ScilabDouble([2]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*N,1)]);
 	model.ipar = new ScilabDouble([length(fname)],[_str2code(frmt)],[N],[swap],[_str2code(fname)]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [N.toString()swap.toString()];
+	var exprs = [string(N)string(swap)];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/WRITEC_f.js b/data_structures/WRITEC_f.js
index 75988a4..3f8f785 100644
--- a/data_structures/WRITEC_f.js
+++ b/data_structures/WRITEC_f.js
@@ -1,9 +1,9 @@
 function WRITEC_f () {
 
 
-	var in = 1;
+	var in1 = 1;
 
-	var nin = sum(in);
+	var nin = sum(in1);
 
 	var frmt = "c, ";
 
@@ -16,16 +16,17 @@ function WRITEC_f () {
 	var N = 2;
 
 	var model = scicos_model();
-	model.sim=list("writec",2);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["writec"]),new ScilabDouble([2]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.evtin = new ScilabDouble([1]);
 	model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*N,1)]);
 	model.ipar = new ScilabDouble([length(fname)],[_str2code(frmt)],[N],[swap],[_str2code(fname)]);
 	model.blocktype = new ScilabString(["d"]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [[sci2exp(in)],[fname],[frmt],[N.toString()swap.toString()]];
+	var exprs = [[sci2exp(in1)],[fname],[frmt],[string(N)string(swap)]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/ZCROSS_f.js b/data_structures/ZCROSS_f.js
index 8b157ec..de4b8d9 100644
--- a/data_structures/ZCROSS_f.js
+++ b/data_structures/ZCROSS_f.js
@@ -3,20 +3,21 @@ function ZCROSS_f () {
 
 	var rpar = [[-1],[-1],[0],[0]];
 
-	var in = 1;
+	var in1 = 1;
 
 	var model = scicos_model();
-	model.sim=list("zcross",1);
-	model.in=new ScilabDouble([in]);
-	model.nzcross=new ScilabDouble([in]);
+	model.sim=list(new ScilabString(["zcross"]),new ScilabDouble([1]));
+	model.in1.push(new ScilabDouble([in1]));
+	model.nzcross=new ScilabDouble([in1]);
 	model.evtout = new ScilabDouble([1]);
 	model.rpar = new ScilabDouble([-1],[-1],[0],[0]);
 	model.blocktype = new ScilabString(["z"]);
 	model.firing = new ScilabDouble([-1]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = strcat(sci2exp(in));
+	var exprs = strcat(sci2exp(in1));
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([2,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/c_block.js b/data_structures/c_block.js
index 0ad6598..97c9cae 100644
--- a/data_structures/c_block.js
+++ b/data_structures/c_block.js
@@ -1,7 +1,7 @@
 function c_block () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var out = 1;
 
@@ -22,8 +22,8 @@ function c_block () {
 	var funam = "toto";
 
 	var model = scicos_model();
-	model.sim=list(" ",2001);
-	model.in=new ScilabDouble([in]);
+	model.sim=list(new ScilabString([" "]),new ScilabDouble([2001]));
+	model.in1.push(new ScilabDouble([in1]));
 	model.out=new ScilabDouble([out]);
 	model.evtin=clkin;
 	model.evtout=clkout;
@@ -35,8 +35,9 @@ function c_block () {
 	model.firing=auto;
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var label = [list([sci2exp(in)],[sci2exp(out)],[	strcat(sci2exp(rpar))],[funam],list([]))];
+	var label = list([sci2exp(in1)],[sci2exp(out)],[	strcat(sci2exp(rpar))],[funam],list([]));
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/fortran_block.js b/data_structures/fortran_block.js
index a352794..5abf2b0 100644
--- a/data_structures/fortran_block.js
+++ b/data_structures/fortran_block.js
@@ -2,8 +2,8 @@ function fortran_block () {
 
 
 	var model = scicos_model();
-	model.sim=list(" ",1001);
-	model.in = new ScilabDouble([1]);
+	model.sim=list(new ScilabString([" "]),new ScilabDouble([1001]));
+	model.in1 = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
 	model.evtin = new ScilabDouble();
 	model.evtout = new ScilabDouble();
@@ -17,8 +17,9 @@ function fortran_block () {
 
 	var funam = "forty";
 
-	var label = [list([sci2exp(model.in)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[funam],list([]))];
+	var label = list([sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[funam],list([]));
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/freq_div.js b/data_structures/freq_div.js
index 18eb20e..47bdf8a 100644
--- a/data_structures/freq_div.js
+++ b/data_structures/freq_div.js
@@ -109,4 +109,5 @@ function freq_div () {
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([3,2]),model,[],gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/generic_block3.js b/data_structures/generic_block3.js
index 745149c..82804f0 100644
--- a/data_structures/generic_block3.js
+++ b/data_structures/generic_block3.js
@@ -7,7 +7,7 @@ function generic_block3 () {
 
 	var funtyp = 4;
 	model.sim=list(function_name,funtyp);
-	model.in = new ScilabDouble([1]);
+	model.in1 = new ScilabDouble([1]);
 	model.in2 = new ScilabDouble([1]);
 	model.intyp = new ScilabDouble([1]);
 	model.out = new ScilabDouble([1]);
@@ -15,8 +15,9 @@ function generic_block3 () {
 	model.outtyp = new ScilabDouble([1]);
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var label = [[function_name;sci2exp(funtyp);sci2exp([model.in,model.in2]);sci2exp(model.intyp);sci2exp([model.out,model.out2])sci2exp(model.outtyp);sci2exp(model.evtin);sci2exp(model.evtout);sci2exp(model.state);sci2exp(model.dstate);sci2exp(model.odstate);sci2exp(model.rpar);sci2exp(model.ipar);sci2exp(model.opar);sci2exp(model.nmode);sci2exp(model.nzcross);sci2exp(model.firing);"y";"n"]];
+	var label = [[function_name;sci2exp(funtyp);sci2exp([model.in1,model.in2]);sci2exp(model.intyp);sci2exp([model.out,model.out2])sci2exp(model.outtyp);sci2exp(model.evtin);sci2exp(model.evtout);sci2exp(model.state);sci2exp(model.dstate);sci2exp(model.odstate);sci2exp(model.rpar);sci2exp(model.ipar);sci2exp(model.opar);sci2exp(model.nmode);sci2exp(model.nzcross);sci2exp(model.firing);"y";"n"]];
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,label,gr_i);
+	return new BasicBlock(this.x)
 }
diff --git a/data_structures/scifunc_block_m.js b/data_structures/scifunc_block_m.js
index 6aa53f3..20d082c 100644
--- a/data_structures/scifunc_block_m.js
+++ b/data_structures/scifunc_block_m.js
@@ -1,7 +1,7 @@
 function scifunc_block_m () {
 
 
-	var in = 1;
+	var in1 = 1;
 
 	var out = 1;
 
@@ -22,9 +22,9 @@ function scifunc_block_m () {
 	var it = 1;
 
 	var model = scicos_model();
-	model.sim=list("scifunc",3);
-	model.in=new ScilabDouble([in]);
-	model.in2.push(new ScilabDouble([in]));
+	model.sim=list(new ScilabString(["scifunc"]),new ScilabDouble([3]));
+	model.in1.push(new ScilabDouble([in1]));
+	model.in2.push(new ScilabDouble([in1]));
 	model.intyp=new ScilabDouble([it]);
 	model.out=new ScilabDouble([out]);
 	model.out2.push(new ScilabDouble([out]));
@@ -40,11 +40,12 @@ function scifunc_block_m () {
 	model.firing=auto;
 	model.dep_ut = new ScilabBoolean([true,false]);
 
-	var exprs = [list([sci2exp([in,in])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)];
+	var exprs = list([sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout);
 	strcat(sci2exp(x0));strcat(sci2exp(z0));
 
 	var strcat(sci2exp(rpar));sci2exp(auto);sci2exp(0)],list("y1 = sin(u1)"," "," ","y1=sin(u1)"," "," "," "));
 
 	var gr_i = [];
 	this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i);
+	return new BasicBlock(this.x)
 }