diff --git a/dist/r3.js b/dist/r3.js
index 378f834..f751c36 100644
--- a/dist/r3.js
+++ b/dist/r3.js
@@ -1,6 +1,6 @@
 class R3 {
-  static version = '2.0.649';
-  static compileDate = '2021 Sep 13 - 09:46:36 am';
+  static version = '2.0.652';
+  static compileDate = '2021 Sep 13 - 09:52:18 am';
 }
 
 class Runtime {
@@ -4306,8 +4306,7 @@ class Project extends R3Object {
 
   Properties:
 
-    - parent (Default value null)
-    - components (Default value [] - A list of components that this entity is composed of)
+    <no properties>
 
   Static Properties:
 
@@ -4321,6 +4320,20 @@ class Project extends R3Object {
 
     <no static methods>
 
+ TEMPLATE_OPTIONS_START
+  parent=null - The parent R3.Object of this component
+  components=[] - A list of components that this entity is composed of
+ TEMPLATE_OPTIONS_END
+
+ TEMPLATE_STATIC_OPTIONS_START
+ TEMPLATE_STATIC_OPTIONS_END
+
+ TEMPLATE_METHODS_START
+ TEMPLATE_METHODS_END
+
+ TEMPLATE_STATIC_METHODS_START
+ TEMPLATE_STATIC_METHODS_END
+
  **/
 
 class EntitySlider extends Entity {
@@ -4344,7 +4357,7 @@ class EntitySlider extends Entity {
     super(options);
 
     /**
-     * parent - No comment
+     * parent - The parent R3.Object of this component
      */
     if (typeof options.parent === 'undefined') {
       options.parent = null;
@@ -4477,7 +4490,6 @@ class EntitySlider extends Entity {
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -4662,11 +4674,6 @@ class ComponentDOM extends Component {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentDOM.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Graphics
@@ -4775,7 +4782,6 @@ ComponentDOM.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -4923,11 +4929,6 @@ class ComponentGraphics extends Component {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentGraphics.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Input
@@ -5036,7 +5037,6 @@ ComponentGraphics.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -5184,11 +5184,6 @@ class ComponentInput extends Component {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentInput.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.DOM.Canvas
@@ -5319,7 +5314,6 @@ ComponentInput.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -5560,11 +5554,6 @@ class ComponentCanvas extends ComponentDOM {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentCanvas.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Graphics.Image
@@ -5691,7 +5680,6 @@ ComponentCanvas.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -5819,11 +5807,6 @@ class ComponentImage extends ComponentGraphics {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentImage.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Graphics.Material
@@ -5950,7 +5933,6 @@ ComponentImage.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -6078,11 +6060,6 @@ class ComponentMaterial extends ComponentGraphics {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentMaterial.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Graphics.Mesh
@@ -6209,7 +6186,6 @@ ComponentMaterial.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -6337,11 +6313,6 @@ class ComponentMesh extends ComponentGraphics {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentMesh.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Graphics.Texture
@@ -6468,7 +6439,6 @@ ComponentMesh.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -6596,11 +6566,6 @@ class ComponentTexture extends ComponentGraphics {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentTexture.ExtendsStaticOptionTest = true;
-
 /**
 
   Class R3.Event.Object.Component.Input.Touch
@@ -6727,7 +6692,6 @@ ComponentTexture.ExtendsStaticOptionTest = true;
  TEMPLATE_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  TEMPLATE_INSTANCE_OPTIONS_MAPPING_START
@@ -6855,11 +6819,6 @@ class ComponentTouch extends ComponentInput {
 
 }
 
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentTouch.ExtendsStaticOptionTest = true;
-
 R3.Runtime = Runtime;
 R3.System = System;
 R3.Event = Event;
diff --git a/package.json b/package.json
index 5847f92..bee7358 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "r3",
-  "version" : "2.0.649",
+  "version" : "2.0.652",
   "description": "",
   "private": true,
   "dependencies": {
diff --git a/src/r3/r3-component/r3-component-canvas.js b/src/r3/r3-component/r3-component-canvas.js
index 2fc0622..f04cd7a 100644
--- a/src/r3/r3-component/r3-component-canvas.js
+++ b/src/r3/r3-component/r3-component-canvas.js
@@ -143,7 +143,6 @@ const ComponentDOM = require('.././r3-component-d-o-m.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -446,10 +445,6 @@ class ComponentCanvas extends ComponentDOM {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentCanvas.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-d-o-m.js b/src/r3/r3-component/r3-component-d-o-m.js
index 6391e8e..c3629f0 100644
--- a/src/r3/r3-component/r3-component-d-o-m.js
+++ b/src/r3/r3-component/r3-component-d-o-m.js
@@ -119,7 +119,6 @@ const Component = require('.././r3-component.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -372,10 +371,6 @@ class ComponentDOM extends Component {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentDOM.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-graphics.js b/src/r3/r3-component/r3-component-graphics.js
index 5d4585a..0bd5426 100644
--- a/src/r3/r3-component/r3-component-graphics.js
+++ b/src/r3/r3-component/r3-component-graphics.js
@@ -117,7 +117,6 @@ const Component = require('.././r3-component.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -336,10 +335,6 @@ class ComponentGraphics extends Component {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentGraphics.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-image.js b/src/r3/r3-component/r3-component-image.js
index 0212b0e..0da88e5 100644
--- a/src/r3/r3-component/r3-component-image.js
+++ b/src/r3/r3-component/r3-component-image.js
@@ -135,7 +135,6 @@ const ComponentGraphics = require('.././r3-component-graphics.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -329,10 +328,6 @@ class ComponentImage extends ComponentGraphics {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentImage.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-input.js b/src/r3/r3-component/r3-component-input.js
index cfc0a84..653a32e 100644
--- a/src/r3/r3-component/r3-component-input.js
+++ b/src/r3/r3-component/r3-component-input.js
@@ -117,7 +117,6 @@ const Component = require('.././r3-component.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -336,10 +335,6 @@ class ComponentInput extends Component {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentInput.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-material.js b/src/r3/r3-component/r3-component-material.js
index 86aedca..0f0e280 100644
--- a/src/r3/r3-component/r3-component-material.js
+++ b/src/r3/r3-component/r3-component-material.js
@@ -135,7 +135,6 @@ const ComponentGraphics = require('.././r3-component-graphics.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -329,10 +328,6 @@ class ComponentMaterial extends ComponentGraphics {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentMaterial.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-mesh.js b/src/r3/r3-component/r3-component-mesh.js
index 5ecf22e..6ae77a2 100644
--- a/src/r3/r3-component/r3-component-mesh.js
+++ b/src/r3/r3-component/r3-component-mesh.js
@@ -135,7 +135,6 @@ const ComponentGraphics = require('.././r3-component-graphics.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -329,10 +328,6 @@ class ComponentMesh extends ComponentGraphics {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentMesh.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-texture.js b/src/r3/r3-component/r3-component-texture.js
index 60c2b23..a78d4c1 100644
--- a/src/r3/r3-component/r3-component-texture.js
+++ b/src/r3/r3-component/r3-component-texture.js
@@ -135,7 +135,6 @@ const ComponentGraphics = require('.././r3-component-graphics.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -329,10 +328,6 @@ class ComponentTexture extends ComponentGraphics {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentTexture.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-component/r3-component-touch.js b/src/r3/r3-component/r3-component-touch.js
index ff80eab..31b0f85 100644
--- a/src/r3/r3-component/r3-component-touch.js
+++ b/src/r3/r3-component/r3-component-touch.js
@@ -135,7 +135,6 @@ const ComponentInput = require('.././r3-component-input.js');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
@@ -329,10 +328,6 @@ class ComponentTouch extends ComponentInput {
 }
 
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
-/**
- * static ExtendsStaticOptionTest - A static test option
- */
-ComponentTouch.ExtendsStaticOptionTest = true;
 //GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
 
 //GENERATED_STATIC_OPTIONS_INIT_START
diff --git a/src/r3/r3-entity/r3-entity-slider.js b/src/r3/r3-entity/r3-entity-slider.js
index d88044a..0d0ff0a 100644
--- a/src/r3/r3-entity/r3-entity-slider.js
+++ b/src/r3/r3-entity/r3-entity-slider.js
@@ -89,8 +89,7 @@ const Entity = require('.././r3-entity.js');
 
   Properties:
 
-    - parent (Default value null)
-    - components (Default value [] - A list of components that this entity is composed of)
+    <no properties>
 
   Static Properties:
 
@@ -106,23 +105,29 @@ const Entity = require('.././r3-entity.js');
 
  GENERATED_INHERITED_END
 
- CUSTOM_OPTIONS_START
-  parent=null
+ TEMPLATE_OPTIONS_START
+  parent=null - The parent R3.Object of this component
   components=[] - A list of components that this entity is composed of
+ TEMPLATE_OPTIONS_END
+
+ CUSTOM_OPTIONS_START
  CUSTOM_OPTIONS_END
 
- CUSTOM_INSTANCE_OPTIONS_MAPPING_START
- CUSTOM_INSTANCE_OPTIONS_MAPPING_END
+ TEMPLATE_STATIC_OPTIONS_START
+ TEMPLATE_STATIC_OPTIONS_END
 
- CUSTOM_LINKED_OBJECTS_START
- CUSTOM_LINKED_OBJECTS_END
+ CUSTOM_STATIC_OPTIONS_START
+ CUSTOM_STATIC_OPTIONS_END
 
- CUSTOM_EXCLUDED_FROM_INSTANCE_OPTIONS_START
- CUSTOM_EXCLUDED_FROM_INSTANCE_OPTIONS_END
+ TEMPLATE_METHODS_START
+ TEMPLATE_METHODS_END
 
  CUSTOM_METHODS_START
  CUSTOM_METHODS_END
 
+ TEMPLATE_STATIC_METHODS_START
+ TEMPLATE_STATIC_METHODS_END
+
  CUSTOM_STATIC_METHODS_START
  CUSTOM_STATIC_METHODS_END
 
@@ -149,9 +154,9 @@ class EntitySlider extends Entity {
 
     super(options);
 
-    //GENERATED_OPTIONS_INIT_START
+    //GENERATED_TEMPLATE_OPTIONS_INIT_START
     /**
-     * parent - No comment
+     * parent - The parent R3.Object of this component
      */
     if (typeof options.parent === 'undefined') {
       options.parent = null;
@@ -162,6 +167,9 @@ class EntitySlider extends Entity {
     if (typeof options.components === 'undefined') {
       options.components = [];
     }
+    //GENERATED_TEMPLATE_OPTIONS_INIT_END
+
+    //GENERATED_OPTIONS_INIT_START
     //GENERATED_OPTIONS_INIT_END
 
     //CUSTOM_OPTIONS_INIT_START
@@ -183,9 +191,15 @@ class EntitySlider extends Entity {
   }
   //GENERATED_CONSTRUCTOR_END
 
+  //GENERATED_TEMPLATE_METHODS_START
+  //GENERATED_TEMPLATE_METHODS_END
+
   //GENERATED_METHODS_START
   //GENERATED_METHODS_END
 
+  //GENERATED_TEMPLATE_STATIC_METHODS_START
+  //GENERATED_TEMPLATE_STATIC_METHODS_END
+
   //GENERATED_STATIC_METHODS_START
   //GENERATED_STATIC_METHODS_END
 
@@ -193,6 +207,12 @@ class EntitySlider extends Entity {
   //CUSTOM_IMPLEMENTATION_END
 }
 
+//GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
+//GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
+
+//GENERATED_STATIC_OPTIONS_INIT_START
+//GENERATED_STATIC_OPTIONS_INIT_END
+
 //GENERATED_OUT_OF_CLASS_IMPLEMENTATION_START
 //GENERATED_OUT_OF_CLASS_IMPLEMENTATION_END
 
diff --git a/src/r3/r3-r3.js b/src/r3/r3-r3.js
index b26f7ee..8bef6d0 100644
--- a/src/r3/r3-r3.js
+++ b/src/r3/r3-r3.js
@@ -1,6 +1,6 @@
 class R3 {
-  static version = '2.0.649';
-  static compileDate = '2021 Sep 13 - 09:46:36 am';
+  static version = '2.0.652';
+  static compileDate = '2021 Sep 13 - 09:52:18 am';
 }
 
 //GENERATED_IMPORTS_START
diff --git a/src/templates/component_extends.template b/src/templates/component_extends.template
index 2712602..884dda0 100644
--- a/src/templates/component_extends.template
+++ b/src/templates/component_extends.template
@@ -18,7 +18,6 @@ const EXTEND_CLASS = require('INCLUDE_PATH/EXTEND_CLASS_FILE_NAME');
  CUSTOM_OPTIONS_END
 
  TEMPLATE_STATIC_OPTIONS_START
-  ExtendsStaticOptionTest=true - A static test option
  TEMPLATE_STATIC_OPTIONS_END
 
  CUSTOM_STATIC_OPTIONS_START
diff --git a/src/templates/entity_extends.template b/src/templates/entity_extends.template
index f2572ff..de339d8 100644
--- a/src/templates/entity_extends.template
+++ b/src/templates/entity_extends.template
@@ -8,23 +8,29 @@ const EXTEND_CLASS = require('INCLUDE_PATH/EXTEND_CLASS_FILE_NAME');
 
  GENERATED_INHERITED_END
 
- CUSTOM_OPTIONS_START
-  parent=null
+ TEMPLATE_OPTIONS_START
+  parent=null - The parent R3.Object of this component
   components=[] - A list of components that this entity is composed of
+ TEMPLATE_OPTIONS_END
+
+ CUSTOM_OPTIONS_START
  CUSTOM_OPTIONS_END
 
- CUSTOM_INSTANCE_OPTIONS_MAPPING_START
- CUSTOM_INSTANCE_OPTIONS_MAPPING_END
+ TEMPLATE_STATIC_OPTIONS_START
+ TEMPLATE_STATIC_OPTIONS_END
 
- CUSTOM_LINKED_OBJECTS_START
- CUSTOM_LINKED_OBJECTS_END
+ CUSTOM_STATIC_OPTIONS_START
+ CUSTOM_STATIC_OPTIONS_END
 
- CUSTOM_EXCLUDED_FROM_INSTANCE_OPTIONS_START
- CUSTOM_EXCLUDED_FROM_INSTANCE_OPTIONS_END
+ TEMPLATE_METHODS_START
+ TEMPLATE_METHODS_END
 
  CUSTOM_METHODS_START
  CUSTOM_METHODS_END
 
+ TEMPLATE_STATIC_METHODS_START
+ TEMPLATE_STATIC_METHODS_END
+
  CUSTOM_STATIC_METHODS_START
  CUSTOM_STATIC_METHODS_END
 
@@ -35,9 +41,15 @@ class CLASS_NAME extends EXTEND_CLASS {
   //GENERATED_CONSTRUCTOR_START
   //GENERATED_CONSTRUCTOR_END
 
+  //GENERATED_TEMPLATE_METHODS_START
+  //GENERATED_TEMPLATE_METHODS_END
+
   //GENERATED_METHODS_START
   //GENERATED_METHODS_END
 
+  //GENERATED_TEMPLATE_STATIC_METHODS_START
+  //GENERATED_TEMPLATE_STATIC_METHODS_END
+
   //GENERATED_STATIC_METHODS_START
   //GENERATED_STATIC_METHODS_END
 
@@ -45,6 +57,12 @@ class CLASS_NAME extends EXTEND_CLASS {
   //CUSTOM_IMPLEMENTATION_END
 }
 
+//GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_START
+//GENERATED_TEMPLATE_STATIC_OPTIONS_INIT_END
+
+//GENERATED_STATIC_OPTIONS_INIT_START
+//GENERATED_STATIC_OPTIONS_INIT_END
+
 //GENERATED_OUT_OF_CLASS_IMPLEMENTATION_START
 //GENERATED_OUT_OF_CLASS_IMPLEMENTATION_END
 
diff --git a/src/templates/entity_extends_constructor.template b/src/templates/entity_extends_constructor.template
index d7c5fcd..583df48 100644
--- a/src/templates/entity_extends_constructor.template
+++ b/src/templates/entity_extends_constructor.template
@@ -16,6 +16,9 @@
 
     super(options);
 
+    //GENERATED_TEMPLATE_OPTIONS_INIT_START
+    //GENERATED_TEMPLATE_OPTIONS_INIT_END
+
     //GENERATED_OPTIONS_INIT_START
     //GENERATED_OPTIONS_INIT_END
 
diff --git a/src/templates/token.db b/src/templates/token.db
index 5a6bdc3..3dd6b6b 100644
--- a/src/templates/token.db
+++ b/src/templates/token.db
@@ -47,7 +47,6 @@ GENERATED_STATIC_OPTIONS_INIT
 GENERATED_STATIC_START_METHOD
 GENERATED_STATIC_STOP_METHOD
 GENERATED_STATIC_SUBSCRIBE_METHOD
-GENERATED_STATIC_TEST_METHOD
 GENERATED_SUBSCRIBE_METHOD
 GENERATED_TEMPLATE_METHODS
 GENERATED_TEMPLATE_OPTIONS_INIT
@@ -109,7 +108,6 @@ CUSTOM_STATIC_OPTIONS
 CUSTOM_STATIC_START_METHOD
 CUSTOM_STATIC_STOP_METHOD
 CUSTOM_STATIC_SUBSCRIBE_METHOD
-CUSTOM_STATIC_TEST_METHOD
 CUSTOM_SUBSCRIBE_METHOD
 CUSTOM_UPDATE_FROM_INSTANCE_METHOD
 CUSTOM_UPDATE_INSTANCE_METHOD
diff --git a/version b/version
index 0b1622b..a404035 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.0.649
\ No newline at end of file
+2.0.652
\ No newline at end of file