diff --git a/project/enums/ECode_ExecutionSupport.csv b/project/enums/ECode_ExecutionSupport.csv
new file mode 100644
index 0000000..134e0df
--- /dev/null
+++ b/project/enums/ECode_ExecutionSupport.csv
@@ -0,0 +1,144 @@
+Invalid
+Untyped
+NewLine
+Comment
+Access_Private
+Access_Protected
+Access_Public
+PlatformAttributes
+Class
+Class_Fwd
+Class_Body
+Constructor
+Constructor_Fwd
+Destructor
+Destructor_Fwd
+Enum
+Enum_Fwd
+Enum_Body
+Enum_Class
+Enum_Class_Fwd
+Execution
+
+Expression
+
+Expr_Identifier
+Expr_NumericLiteral
+Expr_StringLiteral
+
+Expr_Alignof
+Expr_ProcCall
+
+Expr_Assign_Add
+Expr_Assign_Subtract
+Expr_Assign_Multiply
+Expr_Assign_Divide
+Expr_Assign_Modulo
+Expr_Assign_Bitwise_And
+Expr_Assign_Bitwise_Or
+Expr_Assign_Bitwise_XOr
+Expr_Assign_LeftShift
+Expr_Assign_RightShift
+
+Expr_CStyleCast
+Expr_FunctionalCast
+Expr_ConstCast
+Expr_DynamicCast
+Expr_ReinterpretCast
+Expr_StaticCast
+
+Expr_Unary_Add
+Expr_Unary_Minus
+Expr_Unary_Not
+Expr_Unary_Increment
+Expr_Unary_Decrement
+Expr_Indirection
+Expr_AddressOf,
+
+Expr_UnaryPost_Increment
+Expr_UnaryPost_Decrement
+Expr_Subscript
+
+Expr_Binary_Add
+Expr_Binary_Subtract
+Expr_Binary_Multiply
+Expr_Binary_Divide
+Expr_Binary_Modulo
+Expr_Binary_Bitwise_And
+Expr_Binary_Bitwise_Or
+Expr_Binary_Bitwise_XOr
+Expr_Binary_Bitwise_LeftShift
+Expr_Binary_Bitwise_RightShift
+Expr_Binary_Logical_Not
+Expr_Binary_Logical_And
+Expr_Binary_Logical_Or
+Expr_Binary_Equal
+Expr_Binary_NotEqual
+Expr_Binary_Lesser
+Expr_Binary_Greater
+Expr_Binary_LesserEqual
+Expr_Binary_GreaterEqual
+Expr_MemberOfObject,
+Expr_MemberOfPointer,
+Expr_PointerToMemberOfObject,
+Expr_PointerToMemberOfPointer,
+Expr_Comma,
+Expr_Tenary,
+
+Export_Body
+Extern_Linkage
+Extern_Linkage_Body
+Friend
+Function
+Function_Fwd
+Function_Body
+Global_Body
+
+Module
+Namespace
+Namespace_Body
+Operator
+Operator_Fwd
+Operator_Member
+Operator_Member_Fwd
+Operator_Cast
+Operator_Cast_Fwd
+Parameters
+Preprocess_Define
+Preprocess_Include
+Preprocess_If
+Preprocess_IfDef
+Preprocess_IfNotDef
+Preprocess_ElIf
+Preprocess_Else
+Preprocess_EndIf
+Preprocess_Pragma
+Specifiers
+
+Statement
+Stmt_Break
+Stmt_Case
+Stmt_Continue
+Stmt_Declaration
+Stmt_Do
+Stmt_Expr
+Stmt_Else
+Stmt_If
+Stmt_For
+Stmt_Goto
+Stmt_Label
+Stmt_Switch
+Stmt_Switch
+Stmt_While
+
+Struct
+Struct_Fwd
+Struct_Body
+Template
+Typedef
+Typename
+Union
+Union_Body
+Using
+Using_Namespace
+Variable
diff --git a/project/enums/ETokType_New.csv b/project/enums/ETokType_New.csv
index 2601957..bf52f54 100644
--- a/project/enums/ETokType_New.csv
+++ b/project/enums/ETokType_New.csv
@@ -22,6 +22,7 @@ Char,                   "__character__"
 Comma,                  ","
 
 Decl_Class,             "class"
+Decl_Default            "default"
 Decl_GNU_Attribute,     "__attribute__"
 Decl_MSVC_Attribute,    "__declspec"
 Decl_Enum,              "enum"
@@ -39,6 +40,9 @@ Decl_Typedef,           "typedef"
 Decl_Using,             "using"
 Decl_Union,             "union"
 
+Expr_AlignOf,           "alignof"
+
+
 Identifier,             "__identifier__"
 
 Module_Import,          "import"
@@ -94,7 +98,7 @@ Op_GreaterEqual",       ">=
 
 Op_Subscript,                "[]"
 Op_Indirection,              "*"
-Op_Address_Of,               "&"
+Op_AddressOf,                "&"
 Op_MemberOfObject,           "."
 Op_MemberOfPointer",         "->"
 Op_PointerToMemberOfObject,  ".*"
@@ -115,6 +119,7 @@ Preprocess_Include,     "include"
 Preprocess_Pragma,      "pragma"
 Preprocess_Content,	    "__macro_content__"
 Preprocess_Macro,       "__macro__"
+Preprocess_Generic,     "_Generic"
 Preprocess_Unsupported, "__unsupported__"
 
 Spec_Alignof,           "alignof"
@@ -143,11 +148,13 @@ Star,                   "*"
 Stmt_Break,             "break"
 Stmt_Case,              "case"
 Stmt_Continue,          "continue"
+Stmt_Default,           "default"
 Stmt_Do,                "do"
 Stmt_Else,              "else"
 Stmt_End,               ";"
 Stmt_If,                "if"
 Stmt_For,               "for"
+Stmt_Goto,              "goto"
 Stmt_Return,            "return"
 Stmt_Switch,            "switch"
 Stmt_While,             "while"
@@ -155,6 +162,7 @@ Stmt_While,             "while"
 StaticAssert,           "static_assert"
 String,                 "__string__"
 
+Type_Auto,              "auto"
 Type_Unsigned,          "unsigned"
 Type_Signed,            "signed"
 Type_Short,             "short"