diff --git a/tpl/macro.twig b/tpl/macro.twig
index 999e0e6..e615a50 100644
--- a/tpl/macro.twig
+++ b/tpl/macro.twig
@@ -1,4 +1,3 @@
-
 {% macro decl_units(meta) %}
 
 {%- for u in meta.getunits ~%}
@@ -274,17 +273,10 @@ array_merge(parent::CLASS_FIELDS_PROPS(),
 
 class {{o.name}}
 {
-  const CLASS_ID = {{o.classid}};
-
   {{ _self.enum_values(o) }}
 
   const DEFAULT_VALUE = {{o.values|length > 0 ? o.values | first : 0}};
 
-  function getClassId()
-  {
-    return self::CLASS_ID;
-  }
-
   static function isValueValid($value)
   {
     $values_list = self::getValuesList();
@@ -396,7 +388,9 @@ class {{o.name}}
 {% macro class_map(meta) %}
 
 {%- for u in meta.getunits ~%}
+{%- if u.object is instanceof('\\mtgMetaStruct') -%}
   case {{u.object.classid}} : return "{{u.object.name}}";
+{%- endif ~%}  
 {%- endfor ~%}
 
 {% endmacro %}