diff --git a/dist/entry.js b/dist/entry.js
index b49cdd1bfd..93907525f9 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -112,6 +112,17 @@ var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:
     c = c.tagName.toUpperCase();
     !a.isEditing || "INPUT" === c && b || a.editObjectValues(!1);
   }
+}, generateFunctionSchema:function(b) {
+  b = "func_" + b;
+  if (!Entry.block[b]) {
+    var a = function() {
+    };
+    a.prototype = Entry.block.function_general;
+    a = new a;
+    a.changeEvent = new Entry.Event;
+    a.template = Lang.template.function_general;
+    Entry.block[b] = a;
+  }
 }};
 window.Entry = Entry;
 Entry.Albert = {PORT_MAP:{leftWheel:0, rightWheel:0, buzzer:0, leftEye:0, rightEye:0, note:0, bodyLed:0, frontLed:0, padWidth:0, padHeight:0}, setZero:function() {
@@ -12238,17 +12249,11 @@ Entry.Func = function(b) {
   this.blockMenuBlock = this.block = null;
   this.hashMap = {};
   this.paramMap = {};
-  var a = function() {
-  };
-  a.prototype = Entry.block.function_general;
-  a = new a;
-  a.changeEvent = new Entry.Event;
-  a.template = Lang.template.function_general;
-  Entry.block["func_" + this.id] = a;
+  Entry.generateFunctionSchema(this.id);
   if (b) {
     b = this.content._blockMap;
-    for (var c in b) {
-      Entry.Func.registerParamBlock(b[c].type);
+    for (var a in b) {
+      Entry.Func.registerParamBlock(b[a].type);
     }
     Entry.Func.generateWsBlock(this);
   }
@@ -13886,7 +13891,7 @@ Entry.VariableContainer.prototype.setVariables = function(b) {
 };
 Entry.VariableContainer.prototype.setFunctions = function(b) {
   b && b.forEach(function(a) {
-    Entry.block["func_" + a.id] = !0;
+    Entry.generateFunctionSchema(a.id);
   });
   for (var a in b) {
     var c = new Entry.Func(b[a]);
diff --git a/dist/entry.min.js b/dist/entry.min.js
index 6d0782f671..47f09a61ba 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -7,7 +7,8 @@ canvasWidth:480})},resizeElement:function(b){if("workspace"==Entry.type){var a=t
 a+"px";400<=a?Entry.engine.view_.removeClass("collapsed"):Entry.engine.view_.addClass("collapsed");Entry.playground.view_.style.left=a+.5+"px";Entry.propertyPanel.resize(a);var d=Entry.engine.view_.getElementsByClassName("entryAddButtonWorkspace_w")[0];d&&(Entry.objectAddable?(d.style.top=c+24+"px",d.style.width=.7*a+"px"):d.style.display="none");if(d=Entry.engine.view_.getElementsByClassName("entryRunButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=
 .3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a-4+"px");if(d=Entry.engine.view_.getElementsByClassName("entryStopButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a+"px");(a=b.menuWidth)?244>a?a=244:400<a&&(a=400):a=264;b.menuWidth=a;$(".blockMenuContainer").css({width:a-64+"px"});$(".blockMenuContainer>svg").css({width:a-64+"px"});Entry.playground.mainWorkspace.blockMenu.setWidth();
 $(".entryWorkspaceBoard").css({left:a+"px"});Entry.playground.resizeHandle_.style.left=a+"px";Entry.playground.variableViewWrapper_.style.width=a+"px";this.interfaceState=b}Entry.windowResized.notify()},getUpTime:function(){return(new Date).getTime()-this.startTime},addActivity:function(b){Entry.stateManager&&Entry.stateManager.addActivity(b)},startActivityLogging:function(){Entry.reporter&&Entry.reporter.start(Entry.projectId,window.user?window.user._id:null,Entry.startTime)},getActivityLog:function(){var b=
-{};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
+{};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}},generateFunctionSchema:function(b){b="func_"+b;if(!Entry.block[b]){var a=function(){};a.prototype=Entry.block.function_general;a=new a;a.changeEvent=new Entry.Event;a.template=
+Lang.template.function_general;Entry.block[b]=a}}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
 pos:{x:0,y:0}}},ports:{leftProximity:{name:Lang.Blocks.ALBERT_sensor_leftProximity,type:"input",pos:{x:178,y:401}},rightProximity:{name:Lang.Blocks.ALBERT_sensor_rightProximity,type:"input",pos:{x:66,y:359}},battery:{name:Lang.Blocks.ALBERT_sensor_battery,type:"input",pos:{x:88,y:368}},light:{name:Lang.Blocks.ALBERT_sensor_light,type:"input",pos:{x:127,y:391}},leftWheel:{name:Lang.Hw.leftWheel,type:"output",pos:{x:299,y:406}},rightWheel:{name:Lang.Hw.rightWheel,type:"output",pos:{x:22,y:325}},leftEye:{name:Lang.Hw.leftEye,
 type:"output",pos:{x:260,y:26}},rightEye:{name:Lang.Hw.rightEye,type:"output",pos:{x:164,y:13}},bodyLed:{name:Lang.Hw.body+" "+Lang.Hw.led,type:"output",pos:{x:367,y:308}},frontLed:{name:Lang.Hw.front+" "+Lang.Hw.led,pos:{x:117,y:410}}},mode:"both"},tempo:60,timeouts:[],removeTimeout:function(b){clearTimeout(b);var a=this.timeouts;b=a.indexOf(b);0<=b&&a.splice(b,1)},removeAllTimeouts:function(){var b=this.timeouts,a;for(a in b)clearTimeout(b[a]);this.timeouts=[]},name:"albert"};
 Blockly.Blocks.albert_hand_found={init:function(){this.setColour("#00979D");this.appendDummyInput().appendField(Lang.Blocks.ALBERT_hand_found);this.setOutput(!0,"Boolean");this.setInputsInline(!0)}};Entry.block.albert_hand_found=function(b,a){var c=Entry.hw.portData;return 40<c.leftProximity||40<c.rightProximity};
@@ -1143,11 +1144,11 @@ Entry.Utils.waitForWebfonts=function(b,a){for(var c=0,d=0,e=b.length;d<e;++d)(fu
 Entry.isMobile=function(){if(Entry.device)return"tablet"===Entry.device;var b=window.platform;if(b&&b.type&&("tablet"===b.type||"mobile"===b.type))return Entry.device="tablet",!0;Entry.device="desktop";return!1};Entry.Utils.convertMouseEvent=function(b){return b.originalEvent&&b.originalEvent.touches?b.originalEvent.touches[0]:b};Entry.Utils.convertIntToHex=function(b){return b.toString(16).toUpperCase()};Entry.Model=function(b,a){var c=Entry.Model;c.generateSchema(b);c.generateSetter(b);c.generateObserve(b);(void 0===a||a)&&Object.seal(b);return b};
 (function(b){b.generateSchema=function(a){var b=a.schema;if(void 0!==b){b=JSON.parse(JSON.stringify(b));a.data={};for(var d in b)(function(d){a.data[d]=b[d];Object.defineProperty(a,d,{get:function(){return a.data[d]}})})(d);a._toJSON=this._toJSON}};b.generateSetter=function(a){a.set=this.set};b.set=function(a,b){var d={},e;for(e in this.data)void 0!==a[e]&&(a[e]===this.data[e]?delete a[e]:(d[e]=this.data[e],this.data[e]=a[e]instanceof Array?a[e].concat():a[e]));b||this.notify(Object.keys(a),d)};b.generateObserve=
 function(a){a.observers=[];a.observe=this.observe;a.unobserve=this.unobserve;a.notify=this.notify};b.observe=function(a,b,d,e){d=new Entry.Observer(this.observers,a,b,d);if(!1!==e)a[b]([]);return d};b.unobserve=function(a){a.destroy()};b.notify=function(a,b){"string"===typeof a&&(a=[a]);var d=this;d.observers.map(function(e){var f=a;void 0!==e.attrs&&(f=Entry.Utils.intersectArray(e.attrs,a));if(f.length)e.object[e.funcName](f.map(function(a){return{name:a,object:d,oldValue:b[a]}}))})};b._toJSON=function(){var a=
-{},b;for(b in this.data)a[b]=this.data[b];return a}})(Entry.Model);Entry.Func=function(b){this.id=b?b.id:Entry.generateHash();this.content=b?new Entry.Code(b.content):new Entry.Code([[{type:"function_create",copyable:!1,deletable:!1,x:40,y:40}]]);this.blockMenuBlock=this.block=null;this.hashMap={};this.paramMap={};var a=function(){};a.prototype=Entry.block.function_general;a=new a;a.changeEvent=new Entry.Event;a.template=Lang.template.function_general;Entry.block["func_"+this.id]=a;if(b){b=this.content._blockMap;for(var c in b)Entry.Func.registerParamBlock(b[c].type);
-Entry.Func.generateWsBlock(this)}Entry.Func.registerFunction(this);Entry.Func.updateMenu()};Entry.Func.threads={};Entry.Func.registerFunction=function(b){if(Entry.playground){var a=Entry.playground.mainWorkspace;a&&(this._targetFuncBlock=a.getBlockMenu().getCategoryCodes("func").createThread([{type:"func_"+b.id}]),b.blockMenuBlock=this._targetFuncBlock)}};
-Entry.Func.executeFunction=function(b){var a=this.threads[b];if(a=Entry.Engine.computeThread(a.entity,a))return this.threads[b]=a,!0;delete this.threads[b];return!1};Entry.Func.clearThreads=function(){this.threads={}};Entry.Func.prototype.init=function(b){this.id=b.id;this.content=Blockly.Xml.textToDom(b.content);this.block=Blockly.Xml.textToDom("<xml>"+b.block+"</xml>").childNodes[0]};Entry.Func.prototype.destroy=function(){this.blockMenuBlock.destroy()};
-Entry.Func.edit=function(b){this.cancelEdit();this.targetFunc=b;this.initEditView(b.content);this.bindFuncChangeEvent();this.updateMenu()};Entry.Func.initEditView=function(b){this.menuCode||this.setupMenuCode();var a=Entry.playground.mainWorkspace;a.setMode(Entry.Workspace.MODE_OVERLAYBOARD);a.changeOverlayBoardCode(b);this._workspaceStateEvent=a.changeEvent.attach(this,this.endEdit)};
-Entry.Func.endEdit=function(b){this.unbindFuncChangeEvent();this._workspaceStateEvent.destroy();delete this._workspaceStateEvent;switch(b){case "save":this.save();case "cancelEdit":this.cancelEdit()}};Entry.Func.save=function(){this.targetFunc.generateBlock(!0);Entry.variableContainer.saveFunction(this.targetFunc)};
+{},b;for(b in this.data)a[b]=this.data[b];return a}})(Entry.Model);Entry.Func=function(b){this.id=b?b.id:Entry.generateHash();this.content=b?new Entry.Code(b.content):new Entry.Code([[{type:"function_create",copyable:!1,deletable:!1,x:40,y:40}]]);this.blockMenuBlock=this.block=null;this.hashMap={};this.paramMap={};Entry.generateFunctionSchema(this.id);if(b){b=this.content._blockMap;for(var a in b)Entry.Func.registerParamBlock(b[a].type);Entry.Func.generateWsBlock(this)}Entry.Func.registerFunction(this);Entry.Func.updateMenu()};Entry.Func.threads={};
+Entry.Func.registerFunction=function(b){if(Entry.playground){var a=Entry.playground.mainWorkspace;a&&(this._targetFuncBlock=a.getBlockMenu().getCategoryCodes("func").createThread([{type:"func_"+b.id}]),b.blockMenuBlock=this._targetFuncBlock)}};Entry.Func.executeFunction=function(b){var a=this.threads[b];if(a=Entry.Engine.computeThread(a.entity,a))return this.threads[b]=a,!0;delete this.threads[b];return!1};Entry.Func.clearThreads=function(){this.threads={}};
+Entry.Func.prototype.init=function(b){this.id=b.id;this.content=Blockly.Xml.textToDom(b.content);this.block=Blockly.Xml.textToDom("<xml>"+b.block+"</xml>").childNodes[0]};Entry.Func.prototype.destroy=function(){this.blockMenuBlock.destroy()};Entry.Func.edit=function(b){this.cancelEdit();this.targetFunc=b;this.initEditView(b.content);this.bindFuncChangeEvent();this.updateMenu()};
+Entry.Func.initEditView=function(b){this.menuCode||this.setupMenuCode();var a=Entry.playground.mainWorkspace;a.setMode(Entry.Workspace.MODE_OVERLAYBOARD);a.changeOverlayBoardCode(b);this._workspaceStateEvent=a.changeEvent.attach(this,this.endEdit)};Entry.Func.endEdit=function(b){this.unbindFuncChangeEvent();this._workspaceStateEvent.destroy();delete this._workspaceStateEvent;switch(b){case "save":this.save();case "cancelEdit":this.cancelEdit()}};
+Entry.Func.save=function(){this.targetFunc.generateBlock(!0);Entry.variableContainer.saveFunction(this.targetFunc)};
 Entry.Func.syncFuncName=function(b){var a=0,c=[],c=b.split(" "),d="";b=[];b=Blockly.mainWorkspace.getAllBlocks();for(var e=0;e<b.length;e++){var f=b[e];if("function_general"===f.type){for(var g=[],g=f.inputList,h=0;h<g.length;h++)f=g[h],0<f.fieldRow.length&&f.fieldRow[0]instanceof Blockly.FieldLabel&&void 0!=f.fieldRow[0].text_&&(d+=f.fieldRow[0].text_,d+=" ");d=d.trim();if(d===this.srcFName&&this.srcFName.split(" ").length==c.length)for(d=0;d<g.length;d++)if(f=g[d],0<f.fieldRow.length&&f.fieldRow[0]instanceof
 Blockly.FieldLabel&&void 0!=f.fieldRow[0].text_){if(void 0===c[a]){g.splice(d,1);break}else f.fieldRow[0].text_=c[a];a++}d="";a=0}}a=Blockly.Xml.workspaceToDom(Blockly.mainWorkspace);Blockly.mainWorkspace.clear();Blockly.Xml.domToWorkspace(Blockly.mainWorkspace,a)};
 Entry.Func.cancelEdit=function(){this.targetFunc&&(Entry.Func.isEdit=!1,this.targetFunc.block||(this._targetFuncBlock.destroy(),delete Entry.variableContainer.functions_[this.targetFunc.id],delete Entry.variableContainer.selected),delete this.targetFunc,this.updateMenu(),Entry.variableContainer.updateList(),Entry.playground.mainWorkspace.setMode(Entry.Workspace.MODE_BOARD))};
@@ -1278,7 +1279,7 @@ for(c in this.lists_)d=this.lists_[c],d.object_||(a.push(d),e=d.listElement,this
 this.lists_[c],a.push(d),e=d.listElement,this.listView_.appendChild(e),d.callerListElement&&this.listView_.appendChild(d.callerListElement);if("all"==b||"func"==b)for(c in"func"==b&&this.listView_.appendChild(this.functionAddButton_),this.functions_)b=this.functions_[c],a.push(b),e=b.listElement,this.listView_.appendChild(e),b.callerListElement&&this.listView_.appendChild(b.callerListElement);this.listView_.appendChild(this.variableSettingView);this.listView_.appendChild(this.listSettingView)}};
 Entry.VariableContainer.prototype.setMessages=function(b){for(var a in b){var c=b[a];c.id||(c.id=Entry.generateHash());this.createMessageView(c);this.messages_.push(c)}Entry.playground.reloadPlayground();this.updateList()};
 Entry.VariableContainer.prototype.setVariables=function(b){for(var a in b){var c=new Entry.Variable(b[a]),d=c.getType();"variable"==d||"slide"==d?(c.generateView(this.variables_.length),this.createVariableView(c),this.variables_.push(c)):"list"==d?(c.generateView(this.lists_.length),this.createListView(c),this.lists_.push(c)):"timer"==d?this.generateTimer(c):"answer"==d&&this.generateAnswer(c)}Entry.isEmpty(Entry.engine.projectTimer)&&Entry.variableContainer.generateTimer();Entry.isEmpty(Entry.container.inputValue)&&
-Entry.variableContainer.generateAnswer();Entry.playground.reloadPlayground();this.updateList()};Entry.VariableContainer.prototype.setFunctions=function(b){b&&b.forEach(function(a){Entry.block["func_"+a.id]=!0});for(var a in b){var c=new Entry.Func(b[a]);c.generateBlock();this.createFunctionView(c);this.functions_[c.id]=c}this.updateList()};Entry.VariableContainer.prototype.getFunction=function(b){return this.functions_[b]};
+Entry.variableContainer.generateAnswer();Entry.playground.reloadPlayground();this.updateList()};Entry.VariableContainer.prototype.setFunctions=function(b){b&&b.forEach(function(a){Entry.generateFunctionSchema(a.id)});for(var a in b){var c=new Entry.Func(b[a]);c.generateBlock();this.createFunctionView(c);this.functions_[c.id]=c}this.updateList()};Entry.VariableContainer.prototype.getFunction=function(b){return this.functions_[b]};
 Entry.VariableContainer.prototype.getVariable=function(b,a){var c=Entry.findObjsByKey(this.variables_,"id_",b)[0];a&&a.isClone&&c.object_&&(c=Entry.findObjsByKey(a.variables,"id_",b)[0]);return c};Entry.VariableContainer.prototype.getList=function(b,a){var c=Entry.findObjsByKey(this.lists_,"id_",b)[0];a&&a.isClone&&c.object_&&(c=Entry.findObjsByKey(a.lists,"id_",b)[0]);return c};Entry.VariableContainer.prototype.createFunction=function(){if(!Entry.Func.isEdit){var b=new Entry.Func;Entry.Func.edit(b)}};
 Entry.VariableContainer.prototype.addFunction=function(b){};Entry.VariableContainer.prototype.removeFunction=function(b){var a=b.id;b=this.functions_;b[a].destroy();delete b[a];a="func_"+a;Entry.container.removeFuncBlocks(a);for(var c in b)b[c].content.removeBlocksByType(a);this.updateList()};Entry.VariableContainer.prototype.checkListPosition=function(b,a){var c=b.x_+b.width_,d=-b.y_,e=-b.y_+-b.height_;return a.x>b.x_&&a.x<c&&a.y<d&&a.y>e?!0:!1};
 Entry.VariableContainer.prototype.getListById=function(b){var a=this.lists_,c=[];if(0<a.length){for(var d=0;d<a.length;d++)this.checkListPosition(a[d],b)&&c.push(a[d]);return c}return!1};Entry.VariableContainer.prototype.editFunction=function(b,a){};Entry.VariableContainer.prototype.saveFunction=function(b){this.functions_[b.id]||(this.functions_[b.id]=b,this.createFunctionView(b));b.listElement.nameField.innerHTML=b.description;this.updateList()};
diff --git a/src/entry.js b/src/entry.js
index a9e7cd055d..323e32d35c 100644
--- a/src/entry.js
+++ b/src/entry.js
@@ -340,5 +340,17 @@ Entry.cancelObjectEdit = function(e) {
     object.editObjectValues(false);
 };
 
+Entry.generateFunctionSchema = function(functionId) {
+    functionId = 'func_' + functionId;
+    if (Entry.block[functionId]) return;
+    var blockSchema = function () {};
+    var blockPrototype = Entry.block.function_general;
+    blockSchema.prototype = blockPrototype;
+    blockSchema = new blockSchema();
+    blockSchema.changeEvent = new Entry.Event();
+    blockSchema.template = Lang.template.function_general;
+
+    Entry.block[functionId] = blockSchema;
+};
 
 window.Entry = Entry;
diff --git a/src/function.js b/src/function.js
index 638fc6027c..ebb2f8aa94 100644
--- a/src/function.js
+++ b/src/function.js
@@ -28,14 +28,7 @@ Entry.Func = function(func) {
 
     this.paramMap = {};
 
-    var blockSchema = function () {};
-    var blockPrototype = Entry.block.function_general;
-    blockSchema.prototype = blockPrototype;
-    blockSchema = new blockSchema();
-    blockSchema.changeEvent = new Entry.Event();
-    blockSchema.template = Lang.template.function_general;
-
-    Entry.block["func_" + this.id] = blockSchema;
+    Entry.generateFunctionSchema(this.id);
 
     if (func) {
         var blockMap = this.content._blockMap;
diff --git a/src/variable_container.js b/src/variable_container.js
index 3b8f40c652..9876fbb65a 100644
--- a/src/variable_container.js
+++ b/src/variable_container.js
@@ -591,7 +591,7 @@ Entry.VariableContainer.prototype.setVariables = function(variables) {
 Entry.VariableContainer.prototype.setFunctions = function(functions) {
     if (functions) {
         functions.forEach(function(f) {
-            Entry.block['func_' + f.id] = true;
+            Entry.generateFunctionSchema(f.id);
         });
     }